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

4765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
9455e430c9 Add enchantment information in item stack converter. Closes #1523. 2015-11-14 11:40:10 +01:00
Florian Nücke
4b49cc6d2a Fix fully upgraded relays being slower than they should be. Closes #1525. 2015-11-14 10:57:52 +01:00
Florian Nücke
1dec6d1ecd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-11-11 21:21:29 +01:00
Florian Nücke
90087b2448 Fixes #1522. 2015-11-11 21:20:15 +01:00
Shadow1Raven
5fcca8a471 Adding German trenslation. 2015-11-08 12:46:15 +01:00
Florian Nücke
a09c38b18b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/command/SimpleCommand.scala
 2015-10-28 20:07:06 +01:00
Florian Nücke
6118211b22 Should avoid issue with silly people touching config files. Closes #1500. 2015-10-28 20:04:58 +01:00
Florian Nücke
0eefb26b44 Updated to Forestry 4.x API. Closes #1508. 2015-10-28 19:55:06 +01:00
Florian Nücke
528f2ee05e Version bump. 2015-10-28 18:58:28 +01:00
Florian Nücke
8bd423548a Glorious bugfix. Closes #1504. 2015-10-28 18:57:51 +01:00
Florian Nücke
fc23602624 Untested fix for #1496. 2015-10-21 20:06:46 +02:00
Florian Nücke
6a895a72f7 Fixes #1498. 2015-10-21 19:54:18 +02:00
Florian Nücke
ea0f13e24f Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-10-17 14:48:56 +02:00
Florian Nücke
1d4eecb9a5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-10-17 14:48:09 +02:00
Florian Nücke
ab607f0aba Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 
Conflicts:
	build.properties
v1.5.19 		2015-10-17 14:47:53 +02:00
Florian Nücke
99f9794351 Version bump. 2015-10-17 14:47:18 +02:00
Florian Nücke
5588de9223 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 2015-10-17 14:46:32 +02:00
Florian Nücke
ba3153289e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/event/GeolyzerHandler.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/integration/util/Wrench.scala
	src/main/scala/li/cil/oc/integration/vanilla/ConverterNBT.scala
	src/main/scala/li/cil/oc/integration/vanilla/EventHandlerVanilla.scala
	src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala
 2015-10-17 14:03:50 +02:00
Florian Nücke
142e705e91 Merge branch 'alias' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2015-10-17 13:55:22 +02:00
Florian Nücke
f0ff3796c1 Homogeneity, ho! 2015-10-17 13:42:51 +02:00
Florian Nücke
1d4c8828eb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/util/ExtendedNBT.scala
 2015-10-17 13:27:17 +02:00
Florian Nücke
1928cb3704 Emit signal when internal tank of an agent changes. Closes #1487. 2015-10-17 13:13:31 +02:00
Florian Nücke
ffecc8347f Lesson learned: structural typing and obfuscation don't play nice. Fixes #1492. 2015-10-17 12:29:41 +02:00
Florian Nücke
1220838c22 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-10-16 20:48:51 +02:00
Florian Nücke
e47cc37d38 Properly send error state to newly connected clients. 2015-10-16 20:48:37 +02:00
Florian Nücke
2245326356 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/MicrocontrollerRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/ServerRackRenderer.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala
	src/main/scala/li/cil/oc/util/ExtendedBlock.scala
 2015-10-16 20:44:56 +02:00
Florian Nücke
34eab8a5e0 Using power-led to indicate error when computer did not shut down cleanly by making it flash red. Closes #1416. 2015-10-16 20:09:58 +02:00
Florian Nücke
bdcb86a219 Added getComparatorInput to redstone component. Closes #1488. 2015-10-16 18:54:41 +02:00
Florian Nücke
da10c249c6 Add null check in crafting event. Closes #1490. 2015-10-15 22:30:34 +02:00
Florian Nücke
5f134db132 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
 2015-10-13 22:20:39 +02:00
Florian Nücke
6c8452257f Might fix #1485. Shouldn't break everything else. Hopefully. 2015-10-13 22:04:37 +02:00
Florian "Sangar" Nücke
663eef1d96 Merge pull request #1481 from payonel/du 
disk usage bin utility
 2015-10-13 21:39:11 +02:00
payonel
c1c27ce206 add du (disk usage) command to OpenOS bin utils 2015-10-11 23:33:21 -07:00
Florian Nücke
3e8616ebf4 Merge branch 'bc-builder-compat' into master-MC1.7.10 2015-10-07 23:32:30 +02:00
Florian Nücke
32d637bd33 BC builder compat fixery. 2015-10-07 23:31:58 +02:00
Florian Nücke
e8697e6213 Interface parameters, the bane of integration. 2015-10-07 19:15:26 +02:00
Florian Nücke
cbfa615070 Null check in Sound handler in case of partial initializations. 2015-10-06 22:01:17 +02:00
Florian Nücke
1d0f1cb264 Now with 120% less derp! 
That's how math works, right?
 2015-10-06 20:32:31 +02:00
Florian Nücke
b1e29e9b5a Includes FTW. 2015-10-06 20:22:41 +02:00
Florian Nücke
00a2f977f2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/traits/Chargeable.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/RedstoneFlux.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/cofh/energy/EventHandlerRedstoneFlux.scala
	src/main/scala/li/cil/oc/integration/ic2/EventHandlerIndustrialCraft2.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
 2015-10-05 23:38:58 +02:00
Florian Nücke
816ab0c542 Fixed some recipes not using proper ore dict name. Closes #1399. 
For good, I hope.
 2015-10-05 23:20:24 +02:00
Florian Nücke
eb5b44f598 Integration for BuildCraft Programming Table (for loot disks). Closes #1475. 
Utility class for more readable power conversions.
 2015-10-05 23:01:49 +02:00
Florian Nücke
475903daa9 Initial JSONs to allow saving OC blocks in blueprints. 2015-10-04 23:11:16 +02:00
Florian Nücke
b99baf0bcc Added special handling for Magnanimous Tools. Closes #1467. 2015-10-04 23:05:59 +02:00
Florian Nücke
2ead961841 Removed rotatable from assembler, because it's pointless. 2015-10-04 23:04:24 +02:00
payonel
1aa69f4492 alias change to use equal sign and allow list of input 2015-10-04 10:58:54 -07:00
Florian Nücke
d1bc5c071b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/event/NanomachinesHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/server/component/Drone.scala
	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
	src/main/scala/li/cil/oc/server/component/Transposer.scala
	src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
	src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
	src/main/scala/li/cil/oc/server/component/UpgradeSignInAdapter.scala
	src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
	src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControlMk2.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-10-04 17:47:21 +02:00
Florian Nücke
c7cd32515d Allow passing the side from which to interact with an inventory when using inventory controller's suck/drop. Closes #1391. 2015-10-04 17:29:48 +02:00
Florian Nücke
14f54bd845 Pulled together side argument checking a bit. 2015-10-04 17:28:51 +02:00
Florian Nücke
05845fa917 Ensure vanilla chests are in the OreDictionary. Closes #1399. 2015-10-04 11:38:16 +02:00