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

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Florian Nücke
ad4787beec Cache item values in RC converters. 2015-10-02 23:25:26 +02:00
Florian Nücke
17c416007a Merge branch 'dev' of https://github.com/Voidi/OpenComputers into master-MC1.7.10 2015-10-02 23:15:24 +02:00
Florian Nücke
909767a4d5 Allow saving nanomachine configuration to other nanomachines in player's inventory. Closes #1462. 
Also added converter to add address of saved nanomachines.
Also showing address in tooltip of saved nanomachines.
 2015-10-02 23:13:48 +02:00
Florian Nücke
2bdb295d1b Re-create controller when overwriting nanomachines, resetting some more state. Closes #1465. 2015-10-02 22:08:56 +02:00
payonel
efcd32d85b make cd.lua nearly POSIX compliant 
This submission omits support for -L and -P options for cd which specify whether to resolve sym links logically or physically, respectively
We rely on the openos filesystem for symlinks, which is only partially supported (e.g. not-persistent) and thus I feel we should omit explicit support
for these symlink related options to cd - and just allow shell.resolve and shell.setWorkingDirectory to handle the path resolution - which from testing appears
to follow all symlinks logically (which is logical from the user perspective - so a good default).
 2015-09-29 00:31:58 -07:00
Florian Nücke
cb8f37139e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
 2015-09-26 12:14:45 +02:00
Florian Nücke
56755e80ea Should fix potential performance issues in container GUIs in combination with NEI. 2015-09-26 12:11:50 +02:00
payonel
ed4c1dde98 fix tab complete bug when using ./ as path 2015-09-24 21:41:51 -07:00
Florian Nücke
16e48089fe Allow robots to move if max flight height is world height, closes #1454. 2015-09-23 19:35:21 +02:00
Tobias Wohlfarth
85f463ec0c Add Rotarycraft Integration ((item stack converters for jetpacks and springpowered pumps) 2015-09-22 15:32:39 +02:00
Florian Nücke
5addcdddb1 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-09-21 23:49:29 +02:00
Florian Nücke
29793e780e Fixes #1453. 2015-09-21 23:45:43 +02:00
Florian Nücke
2b06e066fb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-21 21:13:22 +02:00
Florian Nücke
f190fa2aaf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/nanomachines/provider/ParticleProvider.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2015-09-21 21:13:07 +02:00
Florian Nücke
72ae2ca626 Derp. 2015-09-21 21:12:44 +02:00
Florian Nücke
e0f4a0c81e Disable chance of stuff breaking when disassembling creatively, closes #1447. 2015-09-21 21:04:14 +02:00
Florian Nücke
bff25a3cca Include particle name in hint, closes #1450. 2015-09-21 20:58:49 +02:00
Florian Nücke
e6922f86c3 Increase the likelihood of some behaviors not being available at all in a configuration. 2015-09-21 20:55:25 +02:00
Florian Nücke
2b970bc65a Added command to generate debug nanomachine configuration (/oc_debugNanomachines or /oc_dn). 2015-09-21 20:54:02 +02:00
Florian Nücke
f3f7fb559e Only enable EnderIO integration for 2.2; will update to 2.3 when it's out of beta. 2015-09-21 19:33:05 +02:00
Florian Nücke
f440245b93 Fix potential stackoverflow in charger, closes #1451. 2015-09-21 19:32:34 +02:00
Florian Nücke
d66fb2a5f4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-20 20:41:08 +02:00
Florian Nücke
a5f42623d3 Fixes #1449. 2015-09-20 20:40:12 +02:00
Florian "Sangar" Nücke
07fd47e842 Merge pull request #1446 from cyber01/RU_doc 
Fix #1445 in RU translation
 2015-09-20 17:40:02 +02:00
cyber01
979dea5337 Fix #1445 in RU translation 2015-09-20 16:57:27 +04:00
Florian Nücke
575d13291e Ignore more stuff that's not on 1.8 yet in build. 2015-09-20 13:42:42 +02:00
Florian Nücke
e8543c1dc5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-09-20 12:31:19 +02:00
Florian Nücke
e9ad0f2e6a Should fix issues rendering some items when equipped by robots, closing #1429. 2015-09-20 12:30:18 +02:00
Florian Nücke
e738a66be7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-20 11:33:24 +02:00
Florian Nücke
b5b7a44196 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-20 11:33:02 +02:00