AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,367 Commits 29 Branches 143 Tags
Commit Graph

5367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vexatos
fee56b284b Merge branch 'master-MC1.8.9' into master-MC1.9.4 2016-12-29 18:41:26 +01:00
Vexatos
094b48c5a1 Merge branch 'master-MC1.7.10' into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/item/Tablet.scala
 2016-12-29 18:40:48 +01:00
Vexatos
16fc8a9113 May fix #2192. 2016-12-29 18:37:36 +01:00
Vexatos
7a8b07dcac Merge remote-tracking branch 'origin/master-MC1.9.4' into master-MC1.9.4 2016-12-29 11:48:11 +01:00
Vexatos
bb8661a218 Fix #2155 and #2207. 2016-12-29 11:48:02 +01:00
Florian Nücke
368ddb8369 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 23:49:33 +01:00
Florian Nücke
21e1890bb4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-17 23:49:04 +01:00
Florian Nücke
94efa8d17e Don't close all sides for adapters placed before the last update. I hope you didn't update if you used adapters to control anything... sensitive. You didn't, right? Right?! 2016-12-17 23:48:11 +01:00
Florian Nücke
cf300f4fdf Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 22:28:52 +01:00
Florian Nücke
941a1aa1f6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-17 22:28:35 +01:00
Florian Nücke
008f55f6bb Version bump. 2016-12-17 22:28:16 +01:00
Florian Nücke
d735fb4926 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 22:13:33 +01:00
Vexatos
e265579a24 Made JEI handlers use the new environmentsFor. 
See #2136.
 2016-12-17 22:01:26 +01:00
Florian Nücke
7320934bdb Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 21:49:29 +01:00
Florian Nücke
deb98924bf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-17 21:49:09 +01:00
Florian "Sangar" Nücke
9441679dbb Merge pull request #2113 from MoonlightOwl/patch-1 
Update ru_RU.lang
 2016-12-17 21:48:46 +01:00
Florian Nücke
a84febeb67 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 21:46:45 +01:00
Florian Nücke
bdacc6ba3a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/Driver.java
#	src/main/java/li/cil/oc/api/detail/DriverAPI.java
#	src/main/scala/li/cil/oc/server/driver/Registry.scala
 2016-12-17 21:45:35 +01:00
Florian Nücke
3548062e82 Merge branch 'multi-environment-providers' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-12-17 21:37:02 +01:00
Florian Nücke
3cf5e7fc87 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
 2016-12-17 21:17:29 +01:00
Florian Nücke
9ddfcb664c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/client/PacketHandler.scala
#	src/main/scala/li/cil/oc/client/Textures.scala
#	src/main/scala/li/cil/oc/common/PacketType.scala
#	src/main/scala/li/cil/oc/common/block/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
#	src/main/scala/li/cil/oc/server/PacketSender.scala
 2016-12-17 21:05:40 +01:00
Florian Nücke
00132337de Added overlay for adapter to indicate open sides. Using same graphic for all adapter sides. Fixed match error when side is closed, homogenized removal logic. 2016-12-17 20:35:18 +01:00
Florian Nücke
15f7524837 Merge branch 'adapter-sides' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-12-17 19:58:40 +01:00
Florian Nücke
d1df3e1f24 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-12-17 14:59:58 +01:00
Florian Nücke
809c87558c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-12-17 14:59:42 +01:00
Florian Nücke
cca50d7c7a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-12-17 14:53:14 +01:00
Florian Nücke
0148ccff26 Make Machine.signal less picky about the types of maps it accepts. 2016-12-17 14:49:05 +01:00
Vexatos
97ee3f3ac7 Added Useability check for wrapped inventories. 2016-12-17 14:47:09 +01:00
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
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
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