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

326 Commits

Author SHA1 Message Date
Florian Nücke
ee6bf9cfa2 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 
# Conflicts:
#	build.properties
 2017-02-25 01:58:00 +01:00
Florian Nücke
b196224775 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	src/main/scala/li/cil/oc/common/init/Items.scala
 2017-02-04 00:18:18 +01:00
Florian Nücke
709bfb7f4f So I'm told we're at 1.6.2 already. Waddaya know. 2017-02-03 22:16:40 +01:00
Florian Nücke
347e2077d6 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 
# Conflicts:
#	build.properties
 2016-12-17 22:34:16 +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
9266c38efe Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-11-12 15:25:10 +01:00
Florian Nücke
8dd328b788 Eh, screw it. 2016-11-12 15:23:01 +01:00
Florian Nücke
b4ff934714 Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-08-01 00:21:10 +02:00
Florian Nücke
7179fcc4f1 RC1 2016-08-01 00:19:46 +02:00
Florian Nücke
34d9bc696b Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-06-25 22:01:22 +02:00
Florian Nücke
b7d0e157c8 Beta 4. 2016-06-25 22:00:36 +02:00
Florian Nücke
1b1456951e Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 
# Conflicts:
#	src/main/java/li/cil/oc/api/IMC.java
#	src/main/scala/li/cil/oc/common/IMC.scala
 2016-06-12 21:16:40 +02:00
Florian Nücke
636396c646 Beta 3. 2016-06-12 21:12:32 +02:00
Florian Nücke
e69d0f2643 Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-06-06 23:39:35 +02:00
Florian Nücke
7892ea07f7 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-06-06 23:39:18 +02:00
Florian Nücke
a2e25f9cdb Beta 2. Yep, back to beta. 2016-06-06 23:38:44 +02:00
Florian Nücke
3e8e94afa1 Update JEI. 2016-05-25 18:07:44 +02:00
Florian Nücke
07534fd54d Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2016-04-16 16:24:00 +02:00
Florian Nücke
21a6f64bf9 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-04-16 16:21:28 +02:00
Florian Nücke
e7b3bcb794 RC1! 2016-04-16 16:20:44 +02:00
Florian Nücke
e7a236fba4 Updated and reenabled IC2 integration. Closes #1761. 2016-04-09 15:10:40 +02:00
Florian Nücke
e90c9ade09 Basic MCMP integration for cables. 2016-03-27 18:18:36 +02:00
Florian Nücke
fb51b88715 Update all the things to get Computronics to run in dev-env >_> 2016-03-20 21:28:09 +01:00
Florian Nücke
1414f99b2d Updated JEI integration. 2016-03-19 21:48:22 +01:00
Florian Nücke
b4d7dd515f Beta time I guess. 2016-03-12 15:02:21 +01:00
Florian Nücke
2f14f09210 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9 2016-03-12 15:02:02 +01:00
Florian Nücke
0d5ca0d875 Beta time I guess. 2016-03-12 14:49:17 +01:00
Florian Nücke
8d45fc41c6 Re-enabled CC integration (untested), closes #1653. 2016-03-12 13:04:02 +01:00
Florian Nücke
338666235b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	build.gradle
#	build.properties
#	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/client/Textures.scala
#	src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
#	src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala
#	src/main/scala/li/cil/oc/common/item/HoverBoots.scala
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
#	src/main/scala/li/cil/oc/server/driver/Registry.scala
 2016-02-27 13:38:18 +01:00
Florian Nücke
d0e0baac98 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/java/li/cil/oc/api/component/TextBuffer.java
#	src/main/java/li/cil/oc/api/event/GeolyzerEvent.java
#	src/main/java/li/cil/oc/api/internal/Case.java
#	src/main/java/li/cil/oc/api/internal/Robot.java
#	src/main/resources/assets/opencomputers/textures/blocks/RackSide.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerFront.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerFrontActivity.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerFrontError.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerFrontOn.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerRackFront.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerRackFrontActivity.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerRackFrontError.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerRackFrontOn.png
#	src/main/resources/assets/opencomputers/textures/blocks/ServerRackSide.png
#	src/main/resources/assets/opencomputers/textures/blocks/overlay/serverRack_front_activity.png
#	src/main/resources/assets/opencomputers/textures/blocks/overlay/serverRack_front_error.png
#	src/main/resources/assets/opencomputers/textures/blocks/overlay/serverRack_front_on.png
#	src/main/resources/assets/opencomputers/textures/blocks/serverRack_front.png
#	src/main/resources/assets/opencomputers/textures/blocks/serverRack_side.png
#	src/main/scala/li/cil/oc/Settings.scala
#	src/main/scala/li/cil/oc/client/GuiHandler.scala
#	src/main/scala/li/cil/oc/client/PacketHandler.scala
#	src/main/scala/li/cil/oc/client/PacketSender.scala
#	src/main/scala/li/cil/oc/client/Proxy.scala
#	src/main/scala/li/cil/oc/client/Textures.scala
#	src/main/scala/li/cil/oc/client/gui/ImageButton.scala
#	src/main/scala/li/cil/oc/client/gui/Server.scala
#	src/main/scala/li/cil/oc/client/gui/ServerRack.scala
#	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
#	src/main/scala/li/cil/oc/client/renderer/block/Rack.scala
#	src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
#	src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
#	src/main/scala/li/cil/oc/client/renderer/tileentity/ServerRackRenderer.scala
#	src/main/scala/li/cil/oc/common/EventHandler.scala
#	src/main/scala/li/cil/oc/common/GuiHandler.scala
#	src/main/scala/li/cil/oc/common/GuiType.scala
#	src/main/scala/li/cil/oc/common/IMC.scala
#	src/main/scala/li/cil/oc/common/PacketBuilder.scala
#	src/main/scala/li/cil/oc/common/Proxy.scala
#	src/main/scala/li/cil/oc/common/block/Rack.scala
#	src/main/scala/li/cil/oc/common/block/traits/StateAware.scala
#	src/main/scala/li/cil/oc/common/component/Terminal.scala
#	src/main/scala/li/cil/oc/common/container/ServerRack.scala
#	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
#	src/main/scala/li/cil/oc/common/event/FileSystemAccessHandler.scala
#	src/main/scala/li/cil/oc/common/event/GeolyzerHandler.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/common/item/Delegator.scala
#	src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
#	src/main/scala/li/cil/oc/common/item/Terminal.scala
#	src/main/scala/li/cil/oc/common/item/traits/Delegate.scala
#	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
#	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/ComponentInventory.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/StateAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/opencomputers/DriverDataCard.scala
#	src/main/scala/li/cil/oc/integration/opencomputers/DriverLootDisk.scala
#	src/main/scala/li/cil/oc/integration/opencomputers/DriverMemory.scala
#	src/main/scala/li/cil/oc/integration/opencomputers/EnvironmentProviderBlocks.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
#	src/main/scala/li/cil/oc/integration/vanilla/DriverBeacon.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverBrewingStand.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverCommandBlock.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverComparator.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverFurnace.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverMobSpawner.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverNoteBlock.java
#	src/main/scala/li/cil/oc/integration/vanilla/DriverRecordPlayer.java
#	src/main/scala/li/cil/oc/integration/vanilla/EventHandlerVanilla.scala
#	src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
#	src/main/scala/li/cil/oc/server/PacketHandler.scala
#	src/main/scala/li/cil/oc/server/agent/Player.scala
#	src/main/scala/li/cil/oc/server/driver/Registry.scala
#	src/main/scala/li/cil/oc/util/BlockPosition.scala
#	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
#	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2016-02-23 20:10:25 +01:00
DrummerMC
590ecebc33 Add ThaumicEnergistics support 2016-02-14 00:07:40 +01:00
Florian Nücke
9113fbbb02 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 2016-01-31 20:20:31 +01:00
Florian Nücke
9530918afe Updated to new Waila API, closes #1559. 2016-01-31 20:19:52 +01:00
Florian Nücke
b683ac93f0 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 
# Conflicts:
#	build.properties
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.32.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.bsd.so
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dll
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.dylib
#	src/main/resources/assets/opencomputers/lib/lua53/native.64.so
 2016-01-15 21:13:20 +01:00
Florian Nücke
811759314d Version bump. 2016-01-15 21:12:04 +01:00
Florian Nücke
7341c20b55 Updated Forge, unfucked metadata on rotatables, yay me. Closes #1600. 2016-01-15 21:00:36 +01:00
Łukasz Magiera
734a80875d Use coloredlightscore jenkins 2016-01-14 15:36:00 +01:00
Florian Nücke
d335a77bc1 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.9 2015-12-31 12:21:44 +01:00
Florian Nücke
3091240c9e Update to MC1.8.9. 2015-12-31 12:16:13 +01:00
Florian Nücke
9dff887a7f Update to TIS-3D 0.7.1. 2015-12-30 00:25:01 +01:00
Florian Nücke
fa2273acd0 Merge branch 'master-MC1.8.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8 
# Conflicts:
#	build.gradle
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 23:52:48 +01:00
Florian Nücke
a020657bf0 Update to TIS-3D 0.7.1. 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 23:50:16 +01:00
Florian Nücke
b8b6d5329e Updated TIS-3D dep. 2015-12-29 23:07:59 +01:00
Florian Nücke
90947436fe Also version bump for consistency... ugh. Time to port 1.6 to 1.8 >_> 2015-12-29 23:04:02 +01:00
Florian Nücke
c873f15db2 Fix OpenGL derpiness in drone and robot item renderer. JEI integration (hiding some items, e.g. robot proxy block used while robots are moving). 2015-12-29 22:59:06 +01:00
Florian Nücke
02043ed83b Re-enable TIS-3D integration. 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/Mods.scala
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
 2015-12-29 20:42:47 +01:00
Florian Nücke
bfab896a28 Added TIS-3D integration. 2015-12-29 15:04:19 +01:00
Florian Nücke
a60f0cb202 Re-enable TIS-3D integration. 2015-12-29 13:58:51 +01:00
Florian Nücke
97d0242639 Merge branch 'OC1.5-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8.8 2015-12-29 13:05:10 +01:00