AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,927 Commits 29 Branches 143 Tags
Commit Graph

2927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
0ae9fe9fae Second attempt at fixing #573. 2014-10-05 21:32:53 +02:00
Florian Nücke
de9f8b68b7 Attempt to fix #573. 2014-10-05 20:01:10 +02:00
Florian Nücke
4bc1c725b8 Made slot querying available to Lua and made OpenOS pick primaries based on slot (picking smallest non-negative slot number for same types). 2014-10-05 18:54:46 +02:00
Florian Nücke
99119d2454 Re- re- re- refactoooor. 2014-10-05 18:26:56 +02:00
Florian Nücke
ef3bd0e229 Added parameter for template IMC registration to specify host type. 2014-10-05 18:15:10 +02:00
Florian Nücke
14d23781a6 Some more API refactoring. 
Pulled the environment class specific worksWith method out of the item driver again, created new specialization interface for it.
 2014-10-05 17:17:45 +02:00
Florian Nücke
7475f04380 Some more refactoring. 2014-10-05 16:39:16 +02:00
Florian Nücke
e35dfb960a Organized imports, splitting up multi imports of the format import pkg.{a, b, c} since those are a pain when merging stuff after imports changed. 2014-10-05 16:25:49 +02:00
Florian Nücke
3841fb4759 Got rid of component.ManagedComponent in favor of dogfooding prefab.ManagedEnvironment. 2014-10-05 16:19:19 +02:00
Florian Nücke
272b9000ff Added priority getter to NamedBlock interface. 2014-10-05 15:17:35 +02:00
Florian Nücke
bc842a150b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 2014-10-05 15:04:00 +02:00
Florian Nücke
28950dd5f4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-10-05 15:03:32 +02:00
Florian Nücke
bfa8914ab5 Fixed side check in tile entities failing in rare cases. Closes #590. 2014-10-05 15:02:57 +02:00
Florian Nücke
761058fa64 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2014-10-05 14:24:44 +02:00
Florian Nücke
43f4ccb988 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2014-10-05 14:13:02 +02:00
Florian Nücke
dfc7457e47 Added setting to allow disablng debug card functionality. 
Added world getter to player values of debug card.
 2014-10-05 13:46:29 +02:00
Florian Nücke
b408f62080 New wcwidth() implementation that uses a plain lookup table based on the unifont.hex file. Closes #591. 
This allows use of all characters in the default unifont provided. I doubt there are any custom ones already anyway, but if there are, there is a small chance this will break some chars in those.
This also means that some characters that don't have an associated glyph now render (like 0x23FB), since unifont sneakily provides a small 'image' of the hexadecimal representation of those characters. Custom fonts will therefore also have to provide those as wide chars, but they don't have a reason to replace those anyway, because they're not defined, after all.
 2014-10-05 13:33:36 +02:00
Florian Nücke
68e1b48316 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-10-04 12:35:16 +02:00
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