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
5,816 Commits 29 Branches 143 Tags
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
3a8132a60e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/server/agent/Inventory.scala
#	src/main/scala/li/cil/oc/server/component/Drone.scala
 2016-12-17 14:35:07 +01:00
Florian Nücke
74353cc2d7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/traits/InventoryWorldControl.scala
 2016-12-17 14:34:30 +01:00
Florian "Sangar" Nücke
1ad747e486 Merge pull request #2175 from Vexatos/itemhandlers 
Rewrote InventoryUtils to use IItemHandlers.
 2016-12-17 14:28:31 +01:00
Vexatos
761875d9ce Made dropIntoItemInventory more specific. 2016-12-17 14:30:50 +01:00
Florian "Sangar" Nücke
ffc65616c0 Merge pull request #2180 from Vexatos/fuzzy-compare 
Added metadata-ignoring fuzzy option to robot.compare.
 2016-12-17 14:23:19 +01:00
payonel
648a289c4a Merge pull request #2183 from gamax92/fix-time-formatter 
Fix time formatter bugs
 2016-12-12 14:28:12 -08:00
gamax92
16d272303c Fix broken c and e time formatting flags 
%c should be using %e not %d
%e does not need a space
 2016-12-12 14:58:59 -07:00
gamax92
f8315269f6 Fix os.time and os.date affected by host timezone 
The UTC timezone has an offset of 0 and does not experience daylights saving time.
 2016-12-12 14:48:49 -07:00
Vexatos
9fe71b7315 Merge remote-tracking branch 'origin/master-MC1.8.9' into itemhandlers 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/traits/ItemInventoryControl.scala
 2016-12-11 20:19:49 +01:00
Florian Nücke
128020d955 Fix the thing. 2016-12-11 20:10:40 +01:00
Florian Nücke
386470a172 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/traits/ItemInventoryControl.scala
 2016-12-11 20:09:03 +01:00
Florian "Sangar" Nücke
a131029fd1 Merge pull request #2181 from Vexatos/fix-item-inventory-control 
Fixed methods ItemInventoryControl not doing what they are supposed to do.
 2016-12-11 20:06:55 +01:00
Vexatos
75356d1f04 Fixed methods ItemInventoryControl not doing what they are supposed to do. 2016-12-11 20:04:06 +01:00
Vexatos
5db3b72cc9 Reverted changes to InventoryProvider and renamed inventoryFor to itemHandlerFor. 2016-12-11 16:35:52 +01:00
Florian Nücke
6cc69b65bd Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-11 16:00:18 +01:00
Florian Nücke
856e668fb0 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-11 15:59:57 +01:00
Florian Nücke
cb8189fa83 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-11 15:59:27 +01:00
Florian Nücke
66aa1f9113 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-11 15:58:05 +01:00
Florian Nücke
3098cdc43e Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-11 15:55:16 +01:00
Vexatos
f237ceb7a7 Added some stack size checks and fixed agent.Inventory. 2016-12-11 15:51:47 +01:00
Florian Nücke
ccee1eeb94 Fixed newly placed cases having zero energy buffer capacity. 2016-12-11 15:50:59 +01:00
Florian Nücke
e1e4c3b5e9 Fixed method doc. 2016-12-11 15:50:04 +01:00
Vexatos
cbaa08ef13 Rewrote InventoryUtils to use IItemHandlers. 2016-12-11 13:25:47 +01:00
Vexatos
db0a67eca5 Added metadata-ignoring fuzzy option to robot.compare. 2016-12-11 13:15:36 +01:00
Florian "Sangar" Nücke
655bf8d85b Merge pull request #2134 from Vexatos/enderio-1.10 
Re-added EnderIO integration and added Bundled Redstone support for EnderIO's Insulated Redstone Conduits
 2016-12-11 12:45:22 +01:00
Florian Nücke
4ffe6220ca Fixed newly placed cases having zero energy buffer capacity. 2016-12-11 12:43:02 +01:00
Florian "Sangar" Nücke
6e1270ef08 Merge pull request #2174 from Vexatos/no-crash-in-NBT 
Fix robots duplicating with SpongeForge.
 2016-12-11 11:58:31 +01:00
Vexatos
4b70a026d2 Allow multiple environment providers to return environments for the same ItemStack. 2016-12-11 11:53:29 +01:00
Florian Nücke
c46d6703c5 Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-12-11 11:38:02 +01:00
Florian "Sangar" Nücke
b8de81f879 Merge pull request #2135 from Vexatos/jei-update 
Updated JEI integration.
 2016-12-11 11:38:50 +01:00
Florian Nücke
988f4e5b85 Made ScoreboardValue properly persist. 2016-12-11 11:37:31 +01:00
Florian Nücke
2e440d09a0 Merge branch 'addScoreboardToDebug' of https://github.com/InfinitySamurai/OpenComputers into master-MC1.10 2016-12-11 11:21:55 +01:00
Vexatos
f48dfee32d Fix #2173. 2016-12-10 16:10:37 +01:00
Vexatos
7a0ac13e64 Allow null side in the Tesla capability. 
Closes #2164.
 2016-12-08 08:36:22 +01:00
payonel
21be185fe9 Merge pull request #2149 from gamax92/fix-luaj-kernel-name 
Fix kernel naming in LuaJ
 2016-11-29 21:04:31 -08:00
gamax92
60512f71d5 Fix kernel naming in LuaJ 
LuaC has "=machine" but LuaJ has "=kernel"
 2016-11-29 15:36:58 -07:00
payonel
6b662a4f79 Merge pull request #2139 from Vexatos/redlogic-fix 
Fixed RedLogic redstone input reading.
 2016-11-20 22:14:16 -08:00
payonel
f2bbc4b288 Merge pull request #2131 from gamax92/uuid-verify 
Fix Arbitrary Read/Write exploit
 2016-11-20 21:41:31 -08:00
Vexatos
a91b7b3939 Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
 2016-11-20 00:18:57 +01:00
Vexatos
d89652961d Merge remote-tracking branch 'origin/master-MC1.8.9' into master-MC1.9.4 2016-11-20 00:18:13 +01:00
Vexatos
b7e03cae44 Added IFluidHandler capability support to tank analytics. 
For #2063.
 2016-11-19 23:41:34 +01:00
Vexatos
baff8dcca6 Fixed RedLogic redstone input reading. 2016-11-17 23:54:47 +01:00
Vexatos
79d952f1c4 Re-added EnderIO integration and added Bundled Redstone support for EnderIO's Insulated Redstone Conduits 2016-11-17 08:23:28 +01:00
Vexatos
764683df2c Updated JEI integration. 2016-11-17 08:19:01 +01:00
gamax92
d0f4a676ec Validate NBT address of FileSystems 
Validate the address stored in hard disks and floppy disks and generate a new address if it is now longer a UUID.
Fixes breaking out of the sandbox and accessing host files with potential writes.

This does not fix being able to modify drives using a debug card or creative mode to access other drives.
 2016-11-14 09:20:01 -07:00
Florian Nücke
03382b733b Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-11-12 15:26:07 +01:00
Florian Nücke
d1b372ecf5 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-11-12 15:25:49 +01:00
Florian Nücke
4a47b04e56 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-11-12 15:25:31 +01:00
payonel
1d5c69924f Merge pull request #2118 from payonel/openloader-installer 
make openloader installer compatable with openos install tool
 2016-11-02 21:42:45 -07:00
payonel
c80943c9ce make openloader installer compatable with openos install tool 2016-11-02 21:30:35 -07:00