AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,317 Commits 29 Branches 143 Tags
Commit Graph

3317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
366c6fc476 Convert blocks in OC inventories on load, in particular to ensure screens in robots are converted. 2014-10-10 15:07:17 +02:00
Florian Nücke
a6da00f4a9 Added some block conversion logic. 
It's not perfect (item blocks have to be in a player's inventory to get converted), but good enough to justify 1.4 again.
 2014-10-10 14:37:32 +02:00
Florian Nücke
9805c0ba85 Should work fine with AE2 rv2 *and* rv1 now. 2014-10-10 12:59:09 +02:00
Florian Nücke
0bc799b979 Added the additions to the AppEng2 integration from OCC. 
Fixed NamedBlock being implemented in drivers instead of environments.
 2014-10-10 01:51:47 +02:00
Florian Nücke
06e9044b11 Screw it, this will be 2.0.0, too much breakage and world save incompatibility so the cut should be cleared in the version number. 
Also: fixed templates.
 2014-10-09 23:16:33 +02:00
Florian Nücke
34249f7131 API stuffs. 2014-10-09 18:59:48 +02:00
Florian Nücke
861a82eecf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into 1.4 
Conflicts:
	build.properties
	src/main/resources/assets/opencomputers/lang/fr_FR.lang
	src/main/resources/assets/opencomputers/lang/zh_TW.lang
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-10-09 18:33:11 +02:00
Florian Nücke
e9ebe5d5c0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	build.properties
 2014-10-09 18:12:24 +02:00
Florian Nücke
e75cea7bb4 Merge branch 'master' of github.com:MightyPirates/OpenComputers v1.3.6 2014-10-09 18:11:36 +02:00
Florian Nücke
a630b93eef Version bump. 2014-10-09 18:11:01 +02:00
Florian Nücke
1e08e87f7f Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-10-09 18:10:14 +02:00
Florian "Sangar" Nücke
1e4ad3eb71 Merge pull request #594 from mymagadsl/patch-4 
Update zh_TW.lang
 2014-10-09 18:06:06 +02:00
Florian Nücke
b136fbc7b7 Renamed tileentity package in API to 'internal', added server and tablet interfaces. 
Some more general cleanup.
 2014-10-09 17:58:36 +02:00
Florian Nücke
185cd6a63f I feel so indecisive... 2014-10-09 16:35:02 +02:00
Florian Nücke
1477ef0af2 Moved some stuff back to where it came from... 2014-10-09 16:28:31 +02:00
Florian Nücke
14b918bb7a If you expect more refactoring, you're not wrong. 2014-10-08 19:47:11 +02:00
Florian Nücke
626b7eb260 Moar singletons, because I can. 2014-10-08 19:13:34 +02:00
Florian Nücke
bd822efe00 Yet more refactoring \o/ 2014-10-08 18:25:24 +02:00
Florian Nücke
0dcc6e2391 Refactoring. 2014-10-08 18:14:15 +02:00
mymagadsl
99b0a53c33 Update zh_TW.lang 2014-10-09 00:13:22 +08:00
Florian Nücke
92fc31c1a1 Fully re-integrated OpenComponents into OpenComputers, re-using existing mod id and presence facilities. 2014-10-08 18:06:29 +02:00
Florian Nücke
5ac3bb33c2 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComponents into 1.4 
Conflicts:
	README.md
	build.gradle
	build.properties
	gradle/wrapper/gradle-wrapper.properties
	gradlew
	gradlew.bat
	settings.gradle
	src/api/java/cofh/api/CoFHAPIProps.java
	src/api/java/cofh/api/energy/EnergyStorage.java
	src/api/java/cofh/api/energy/IEnergyConnection.java
	src/api/java/cofh/api/energy/IEnergyContainerItem.java
	src/api/java/cofh/api/energy/IEnergyHandler.java
	src/api/java/cofh/api/energy/IEnergyStorage.java
	src/api/java/dan200/computercraft/api/ComputerCraftAPI.java
	src/api/java/dan200/computercraft/api/lua/ILuaContext.java
	src/api/java/dan200/computercraft/api/lua/ILuaObject.java
	src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java
	src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java
	src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java
	src/main/resources/LICENSE
	src/main/resources/mcmod.info
	src/main/resources/pack.mcmeta
 2014-10-08 17:10:03 +02:00
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 "Sangar" Nücke
af0533ca81 Merge pull request #593 from Mazdallier/patch-1 
Update fr_FR.lang
 2014-10-07 13:35:17 +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
Mazdallier
40a9bde2eb Update fr_FR.lang 2014-10-07 11:52:54 +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
34d876fcf9 Made AE2 presence check version specific to avoid log spam when <rv2 is present. 2014-10-05 22:19:48 +02:00
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