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

2766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
9a91e569e5 Added tooltip to indicate energy conversion speed. 
Consistency in tooltips.
Renamed assember tile entity to assembler (from old robot assembler) and renamed localization strings, too.
Fixed NPE in NEI documentation generation.
Made NEI not show robots.
 2014-10-08 14:23:09 +02:00
Florian Nücke
9b99729b94 Reworked power logic a lot. Different blocks now provide different conversion speeds, so power converters have more reason to exist. Let's see how much I broke in the process \o/ 
Also, access points now accept power, in return they also consume power for wireless messages sent from, say ComputerCraft.
Fixed some power related stuff not being saved (other mod's node/similar constructs) leading to minor energy losses across saves.
Re-tweaked some conversion values.
 2014-10-08 02:28:12 +02:00
Florian Nücke
ed81caa4ac Made call budgets configurable. 2014-10-07 19:15:43 +02:00
Florian Nücke
c9c5c66eb6 Alternative docstring pattern and added note to documentation. 2014-10-07 17:53:45 +02:00
Florian Nücke
09a7dd36bb Fixed robot movement. 2014-10-07 16:36:29 +02:00
Florian Nücke
092bd17a84 Added architecture switching on CPUs by shift-right clicking them. 
Fixed an issue with synchronized calls potentially throwing limit reached exceptions.
 2014-10-07 15:12:58 +02:00
Florian Nücke
ca68021166 Using item identifier instead of unlocalizedName in item stack converter. 2014-10-07 14:00:39 +02:00
Florian Nücke
98b03b271d Added marker interfaces for computer cases and server racks. 
Extended robot marker interface with some more interfaces.
 2014-10-07 13:32:51 +02:00
Florian Nücke
520a267275 Added NEI plugin to show component APIs in usage of items and blocks. 2014-10-07 12:18:31 +02:00
Florian Nücke
9ae98d54be Added callBudget method to MachineHost, allowing for CPU tier based machine speeds. 
Call budget is now per machine, not per component per machine. This leads to potentially more forced synchronized calls, but is overall much more robust and reliable as a limit. In compensation, the fastest machines (T3 CPU) are now slightly faster than what was possible before.
 2014-10-06 21:45:01 +02:00
Florian Nücke
45cc1f4259 Fixed keyboard can stay check. 2014-10-06 20:28:09 +02:00
Florian Nücke
62939fd461 Showing indicator for disk activity on disk drives, cases and server racks. 2014-10-06 17:29:13 +02:00
Florian Nücke
4f95b38d02 Added client side event for file system activity. 2014-10-06 15:13:40 +02:00
Florian Nücke
b3862a99d1 Lua-side implementation of getter/setter callbacks. 2014-10-06 14:16:15 +02:00
Florian Nücke
818caae9d0 Added getter/setter properties for callback annotation (not used yet) and cleaned up API some more. 2014-10-06 12:41:02 +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
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
a526b0efc4 Print startup errors from tablets to chat as is done for computers. 2014-09-30 22:34:28 +02:00