AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,459 Commits 29 Branches 143 Tags
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
45f62eeb9b Fixed platform architecture detection. Closes #588. 2014-10-04 12:33:19 +02:00
Florian Nücke
fd42428c53 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 
Conflicts:
	src/main/resources/assets/opencomputers/lang/zh_CN.lang
	src/main/scala/li/cil/oc/server/machine/luac/OSAPI.scala
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-10-03 15:04:43 +02:00
Florian Nücke
b0d9c8d056 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/mods/vanilla/DriverInventory.java
 2014-10-03 13:19:59 +02:00
Florian Nücke
998e228820 Little experiment to try and make the inventory driver respect permissions on inventories (using a fake player an isUseableByPlayer). 2014-10-03 13:11:41 +02:00
Florian Nücke
69df494977 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-10-02 21:01:46 +02:00
Florian Nücke
a951fa145a Passing on optional parameters in robot API. v1.3.5 2014-10-02 21:01:27 +02:00
Florian Nücke
c57d705e9b Updated CC API. 2014-10-02 20:05:23 +02:00
Florian Nücke
a6a96c4e27 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
 2014-10-02 20:01:37 +02:00
Florian Nücke
01e448eddd Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-10-02 19:55:35 +02:00
Florian Nücke
eb94965142 Repackaging LuaJ and JNLua to avoid conflicts with other mods. Closes #586. 2014-10-02 19:55:19 +02:00
Florian Nücke
b9d6be07b2 Small robot fluid error message fix. 2014-10-02 12:34:15 +02:00
Florian "Sangar" Nücke
fbd4f85d78 Merge pull request #585 from ViKaleidoscope/patch-2 
Update zh_CN.lang
 2014-10-02 12:11:11 +02:00
Saku
73196affa7 Update zh_CN.lang 2014-10-02 17:25:40 +08:00
Florian Nücke
3727cfd69a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 
Conflicts:
	src/main/resources/assets/opencomputers/lang/de_DE.lang
	src/main/resources/assets/opencomputers/lang/en_US.lang
	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
 2014-10-02 02:10:14 +02:00
Florian Nücke
6851a4f970 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-10-01 18:37:59 +02:00
Florian Nücke
860130cff2 Fixed check for whether used item has been 'used up' in robots for cases where the stack is replaced by the interact function. Fixes #583. 2014-10-01 18:36:14 +02:00
Florian Nücke
8f79419788 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/driver/converter/FluidTankInfo.scala
	src/main/scala/li/cil/oc/server/driver/converter/ItemStack.scala
 2014-10-01 18:11:57 +02:00
Florian Nücke
2d9cdfac72 Added icons for tank upgrade and tank controller upgrade. 
Added localizations for the same.
Added the tank controller upgrade.
Added recipes for the two.
Some fixery.
 2014-10-01 17:40:52 +02:00
Florian Nücke
21488bc6f2 Some cleanup. 
Added a few more methods for fluid interaction (compare tank contents, transfer contents).
Made fluids properly flow when placed into the world.
Sending neighbor update info when adding / removing components, allows pipes connected to robots to refresh.
Added tooltip showing contents for tank upgrades.
Undid changes to the API.
 2014-10-01 14:35:21 +02:00
Florian Nücke
d6e2736229 Merge branch 'master' of github.com:MightyPirates/OpenComputers into robot-fluids 
Conflicts:
	src/main/scala/li/cil/oc/Items.scala
 2014-10-01 10:40:41 +02:00
Florian Nücke
b1946e1bc5 Merge branch 'MC1.7' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-10-01 10:27:35 +02:00
Florian Nücke
c75417c008 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 
Conflicts:
	src/main/java/li/cil/occ/mods/enderstorage/DriverFrequencyOwner.java
	src/main/java/li/cil/occ/mods/redstoneinmotion/DriverCarriageController.java

Also re-added support for EnderStorage mod.
 2014-10-01 10:24:43 +02:00
Florian Nücke
7e4d4fc412 Added a bunch more ingame documentation for methods. 2014-10-01 10:03:34 +02:00
Florian Nücke
a526b0efc4 Print startup errors from tablets to chat as is done for computers. 2014-09-30 22:34:28 +02:00
Florian Nücke
df461d1185 Fixed floppy disks losing their contents when recolored. 2014-09-30 21:36:50 +02:00
Florian Nücke
1b95fca820 Bumped version numbers to allow testing with new wr-cbe (it still works \o/). 2014-09-30 21:29:57 +02:00
Johannes Lohrer
544f030c38 store methods 2014-09-30 20:00:50 +02:00
Florian Nücke
15ed83494e Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
 2014-09-28 12:08:13 +02:00
Florian Nücke
2cdedab170 Made the loaded chunks a set, because I don't trust it to not be dynamically re-generated each time it's accessed by contains. 2014-09-28 12:06:14 +02:00
Jesse Ward
32ebe03ace ChunkLoader Upgrade now loads a 3x3 chunk area centered on the robot. 2014-09-28 12:01:27 +02:00
Florian "Sangar" Nücke
eaece073f9 Merge pull request #580 from Nibato/master-MC1.7.10 
ChunkLoader Upgrade now loads a 3x3 chunk area centered on the robot. Fixes #579.
 2014-09-28 12:00:27 +02:00
Jesse Ward
7b43512d9d ChunkLoader Upgrade now loads a 3x3 chunk area centered on the robot. 2014-09-28 01:20:48 -04:00
Florian Nücke
973478660f Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/server/driver/item/Tablet.scala
 2014-09-26 17:20:49 +02:00
Florian Nücke
c8358ce31f Force stopping tablets when placed into charger now, to force flushing buffered file systems. 
Fixed incorrect addressing of HDDs in tablets when in charger.
Some stabilization of tracked components in machines (checking if component's type remained the same since saving).
 2014-09-26 17:11:34 +02:00
Florian Nücke
d6514878f7 Hmm, this might make more sense. Maybe. 2014-09-25 18:37:03 +02:00
Florian Nücke
b31692bbb6 Fixery. 2014-09-25 17:45:52 +02:00
Florian Nücke
7a29055c26 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 
Conflicts:
	src/main/scala/li/cil/oc/common/Slot.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/server/driver/item/Tablet.scala
 2014-09-25 17:16:54 +02:00
Florian Nücke
5b0b487dfa Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-09-25 17:04:10 +02:00
Florian Nücke
48f9b09475 More API work! 2014-09-25 17:03:44 +02:00
Florian Nücke
b610f33726 Made tablets a separate (internal until API change) slot type, allows rendering icon background in charger GUI. 
Tablets cannot be placed into disk drives any longer; this functionality is now achieved by placing them into chargers, making things a little less... all over the place.
 2014-09-25 17:02:41 +02:00
Florian Nücke
f4ee070718 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 2014-09-25 13:42:56 +02:00
Florian Nücke
c157881ce9 The bane of + dependencies. 2014-09-25 13:42:31 +02:00
Florian Nücke
54f5ef6df8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.8prep 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
	src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
	src/main/scala/li/cil/oc/server/component/UpgradeSolarGenerator.scala
	src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
 2014-09-25 13:18:04 +02:00
Florian Nücke
2f162ea159 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
 2014-09-25 12:25:03 +02:00
Florian Nücke
190d57bf45 Fixed a bunch of *potentially* derpy coordinate computations. 
Made sign upgrade in tablet also work when standing "inside" the sign.
 2014-09-25 12:22:49 +02:00
Florian Nücke
4a447996e8 Added support for AE2 power, closes #508. 2014-09-24 22:18:51 +02:00
Florian Nücke
224cef4f0b Re-implemented UE support using the new API. May or may not work! 2014-09-24 16:37:47 +02:00
Florian Nücke
9863521870 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
 2014-09-24 13:21:26 +02:00
Florian Nücke
86175d1e39 Naming fixes and stuff. 2014-09-24 13:17:57 +02:00
Florian Nücke
9f7f22cfa1 Tablets can now be disassembled. 2014-09-24 09:46:03 +02:00