AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,674 Commits 29 Branches 143 Tags
Commit Graph

3674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
29b9a2d007 Tweaked insertion patch a little to only be used when an explicit range is supplied. This will make it work as before, preferring merges in inventories without a specific "order" (such as normal chests). Also added safeguard against empty ranges, since that matters now, just in case... 2015-02-05 13:02:09 +01:00
Florian Nücke
fbf5f2af6f Merge branch 'insertIntoInventory-fix' of https://github.com/DirtYiCE/OpenComputers into 1.5 2015-02-05 12:55:21 +01:00
Florian "Sangar" Nücke
e21f573a60 Merge pull request #890 from hunator/patch-2 
Create manpage for yes.lua.
 2015-02-05 12:43:27 +01:00
Florian Nücke
34083e98e1 Reworked internet component to use userdata, makes for nicer interaction from the Lua side. 
Also allows a clean way of providing response information (code, message and headers).
Code only interacting with the internet lib should not be affected by these changes.
 2015-02-05 12:40:31 +01:00
Florian "Sangar" Nücke
3bbb96d57b Merge pull request #889 from hunator/patch-1 
Create yes.lua
 2015-02-05 09:06:20 +01:00
Martin Hunek
36a2661922 Update yes.lua 2015-02-04 17:59:27 +01:00
Florian Nücke
4f9165d4be That needs to move, too... 2015-02-04 17:51:55 +01:00
Florian Nücke
58056a837c Improved block rendering a bit, should play much nicer with shaders now (thanks a ton to Ivorius for pointers). 2015-02-04 17:49:45 +01:00
Martin Hunek
8732527882 Create yes 
Man page for yes command.
 2015-02-04 17:46:24 +01:00
Martin Hunek
8b864322f2 Create yes.lua 
Lua implementation of functionality provided by yes command from GNU coreutils. However it doesn't use any of GNU, so it is not forcing GPLv3+ license.

It has full functionality but options had to been changed to single letter (like -h instead of original --help in GNU). Main use case requires piping, but works without it.

I have also created man page, but I have to send it in different pull request (don't know how to do it in github webpage).
 2015-02-04 17:37:55 +01:00
Florian Nücke
2ac78463a1 Added eeprom.getData/setData for mutable persistent bios storage, replaces get/setBootAddress. 
get/setData is wrapped by the default Lua bios into functions with these names to avoid breaking programs using them.
 2015-02-04 16:48:57 +01:00
Florian Nücke
9e92ee508c Allow drones to interact with the world more (break hand-harvestable blocks, place blocks). 
inb4 totally overpowered.
 2015-02-04 15:57:46 +01:00
Florian Nücke
791d469942 Started work on unifying agent component logic. 2015-02-04 07:37:04 +01:00
Florian Nücke
78deba91d0 More fake player slot fixery, added owner info into Agent interface. 2015-02-04 05:26:38 +01:00
Florian Nücke
5e313d4fe7 Fixery for refactory. 2015-02-04 03:52:05 +01:00
Florian Nücke
f2e6cf1896 Adjusting slot offsets. 2015-02-04 01:51:10 +01:00
Florian Nücke
8bc4f94d7c More work on generalizing agent logic. 2015-02-04 01:42:28 +01:00
Florian Nücke
f36505f0ff Little refactoring in preparation of generalizing robot fake player. 2015-02-04 00:50:45 +01:00
Florian Nücke
1561854e5b Pulled multi-tank interface into API. 2015-02-03 23:34:35 +01:00
Florian Nücke
38bd133d1e Removed some very old config and block/item name patches. When directly upgrading from versions that old, stuff would break anyway. 2015-02-03 21:24:19 +01:00
Florian Nücke
82ab190544 Made memory architecture agnostic, archs now determine on their own how memory tier / scale maps to physical memory size. 
Reworked MachineHost a bit, it's now much slimmer, only needs to provide the list of internally installed itemstacks, machine computes stuff it needs based on that. Much less duplicate code!
 2015-02-03 21:20:53 +01:00
Florian Nücke
fb0a9a33dd Update handlers for agent based events. 2015-02-03 19:05:51 +01:00
Florian Nücke
664bfcfeca Pulled machine getter into MachineHost, adding that as super to machine related internal interfaces. 2015-02-03 18:49:02 +01:00
Florian Nücke
578df68bc7 Changed GeolyzerEvent.Analyze to take an absolute position instead of the side of the host for more flexibility. 2015-02-03 17:10:41 +01:00
Florian Nücke
9c86caa7da Removed deprecated stuff. 2015-02-03 17:04:54 +01:00
Florian Nücke
298d97639e Started reworking API for 1.5. 2015-02-03 16:59:04 +01:00
Florian Nücke
806dda8827 Fixes robots dropping the remainder of a slot's content instead of the number specified to drop; closes #885. 2015-02-03 12:57:05 +01:00
Florian Nücke
5381e9d2d2 Typesafe config is provided by Forge now, no need to have the license in the repo anymore. 2015-02-03 12:37:26 +01:00
Florian Nücke
7bc101e54e Updated Waila integration, re-enabled VersionChecker integration (untested). 2015-02-03 02:25:53 +01:00
Florian Nücke
57b8968060 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
 2015-02-03 01:39:50 +01:00
Florian Nücke
596ba6f2c1 All the vals! Also removed minor oddity. 2015-02-02 23:19:01 +01:00
Florian Nücke
f69250b565 Added ability to copy lines from screens using the analyzer (shift-rightclicking the line with the analyzer), then paste it on a screen by simply rightclicking it with the analyzer. Closes #644. 2015-02-02 23:05:21 +01:00
Florian Nücke
16170e31ee Bumped remote terminal resolution and color depth to tier three, to keep them competitive with tablets with container slots. Closes #822. 
Will need breaking and re-placing server racks to work in existing worlds (because max res is saved now).
 2015-02-02 20:57:21 +01:00
Florian Nücke
cea9c1cdbc Added debug.insertFluid and debug.removeFluid, closes #882. 2015-02-02 19:12:32 +01:00
Florian Nücke
e5d8f3ab5d Disallow breaking creative tier robots by non-creative, non-authorized players. Closes #868. 
Also fixed visual desync when "breaking" a creative case.
 2015-02-02 18:48:45 +01:00
Florian Nücke
b136e2ab7f Added inventory_controller.compareToDatabase, closes #861. 2015-02-02 18:05:50 +01:00
Florian Nücke
5a4dedf6d1 Right-clicking blocks with tablet in hand will now allow components to populate a data table. If any is given, a tablet_use signal is sent to the tablet, with the data passed as a table as the only parameter for the signal. Closes #858. 2015-02-01 23:38:43 +01:00
Florian Nücke
0fdbd38643 Allow pushing NBTTagCompounds as signals and added converter for NBTTagCompound. 2015-02-01 23:02:11 +01:00
Florian Nücke
2aa0b08b23 Adjusted MCVersion of TransformerLoader. 2015-02-01 16:13:05 +01:00
Florian Nücke
d952c809af Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-02-01 15:14:58 +01:00
Florian Nücke
8092fae0a1 Revert using addresses in VFS back to using proxy objects, since I probably won't ever come around to actually implement mounts and symlinks being saved across reboots anyway. Closes #879. 
This [partially] reverts commit 42040e2da654d23a74386c5f188aa0053646c100.

Conflicts:
	src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua
 2015-02-01 15:10:26 +01:00
Florian Nücke
e6668d59b4 Limiting number of parts allowed in network packets as a safeguard for weaker computers, as discussed in #876. Configurable, of course. 2015-02-01 14:47:57 +01:00
Florian Nücke
c30d5b29ff Gnah, missed one. Should *fully* fix #859 now. 2015-02-01 14:27:50 +01:00
Florian Nücke
10c7276ecf Merge branch 'sides-idiom' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-01 14:14:51 +01:00
Florian Nücke
286c98e438 Adjusted tablet case rendering for 1.8 and cleared out setting migrations. 2015-02-01 03:10:49 +01:00
Florian Nücke
98f76e6507 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/API.java
	src/main/resources/assets/opencomputers/textures/items/TabletCase.png
	src/main/resources/assets/opencomputers/textures/items/TabletCase0.png
	src/main/resources/assets/opencomputers/textures/items/tabletCase.png
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/data/TabletData.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/util/Waila.scala
	src/main/scala/li/cil/oc/server/CommandHandler.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
 2015-02-01 02:31:43 +01:00
Florian Nücke
4edeb0a1b8 Added new command, /oc_preventDisassembling (alias: /oc_nodis), which will mark the currently held item so that the disassembler will not work for it. Closes #875. 2015-02-01 00:28:39 +01:00
Florian Nücke
d870d376aa Slightly reworked logic of crafting upgrade to also support repairing items, fixes #874. Doesn't appear to break everything else. 2015-02-01 00:06:43 +01:00
Florian Nücke
fb8cca23ab Make strings count at least one towards a packet size, avoids creation of large packets by using empty strings. Fixes #876. 2015-01-31 23:28:54 +01:00
Florian Nücke
ecf6ee76d4 Added driver for IDeepStorageUnit. Closes #871. 
Using separate "mod" based on interface presence so it also works for mods using and shipping the interface when MFR isn't present (such as JABBA).
 2015-01-30 22:21:55 +01:00