AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-22 03:45:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,014 Commits 29 Branches 143 Tags
Commit Graph

237 Commits

Author SHA1 Message Date
Florian Nücke
1d240888c3 Updated MCMP integration. Closes #1803. 2016-05-14 23:27:50 +02:00
Florian Nücke
0deee60d0e Bulk of the 1.9 port. 
A couple of issues remain:
- Robot rendering is borked as fudge.
- Colored cables don't really look colored in item form.
- Recoloring cables seems to dupe items.
Also, only barely tested the essentials (placed every block, spawned computer, 3d printed some stuff).
 2016-05-08 19:56: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
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
9530918afe Updated to new Waila API, closes #1559. 2016-01-31 20:19:52 +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
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
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
979f00d81d Fixed a bunch of rendering glitches. Fixed NPE in hologram TESR. 2015-12-29 13:02:06 +01:00
Florian Nücke
d43023952b Updated forge and mappings. 2015-12-22 00:29:08 +01:00
Florian Nücke
214a0c2c30 Ohwaitididntbumptheversionyet. 2015-12-16 21:39:11 +01:00
Florian Nücke
85a7a240e2 Welp, it compiles. And runs. But screens and cables don't render properly. 2015-12-11 16:21:42 +01:00
Florian Nücke
e0a6469bc3 Progress on porting to 1.8.8, generics in block state properties are killing my generic system :( 2015-12-09 21:21:42 +01:00
Florian Nücke
5ee0332cb6 Oh right, that's why that was separate... >_> 2015-11-23 00:17:08 +01:00
Florian Nücke
951e8b6180 Updated to ForgeGradle 2 and latest Forge, adjusted build scripts. 
Let's see if this works...
 2015-11-22 22:31:34 +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
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
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
99f9794351 Version bump. 2015-10-17 14:47:18 +02:00
Florian Nücke
cb433d3b01 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
	src/main/scala/li/cil/oc/util/BlockPosition.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-09-17 22:15:33 +02:00
Florian "Sangar" Nücke
2162f31d56 Merge pull request #1407 from chaoskagami/nek-fix-2 
Update to the proper final repo for NeK. Or so I hope, at least.
 2015-09-14 12:49:47 +02:00
Florian Nücke
b0950d73b2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/inventory/Inventory.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-09-11 01:13:57 +02:00
chaoskagami
27130ef44a Update to the proper final repo for NeK. Or so I hope, at least. 2015-09-07 21:58:54 -04:00
Florian Nücke
f8b9436f9c Version bump 2015-09-06 16:55:52 +02:00
Florian Nücke
9c9ce8d4e5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
 2015-09-06 00:23:33 +02:00
Florian Nücke
d92f3ca9d8 Merge branch 'nek-fix' of https://github.com/chaoskagami/OpenComputers into master-MC1.7.10 2015-09-05 23:39:52 +02:00
Florian Nücke
d90325e6d5 Bump version. 2015-09-05 23:03:23 +02:00
chaoskagami
38f30944f1 Fix for NeK maven being removed 2015-09-04 20:40:33 -04:00
Florian Nücke
929d9f58fe Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
	src/main/scala/li/cil/oc/util/ExtendedArguments.scala
 2015-08-12 19:06:28 -07:00
Florian Nücke
e99e973228 Version bump. 2015-08-12 15:07:30 -07:00
Florian Nücke
88b4f3b5b7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-07-25 14:12:16 +02:00
Florian Nücke
284598d9a2 Version bump. 2015-07-25 14:11:42 +02:00
Florian Nücke
22fe034609 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala
	src/main/scala/li/cil/oc/common/block/Assembler.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/integration/fmp/CablePart.scala
 2015-07-12 14:09:21 +02:00
Florian Nücke
0fa31e854e Version bump. 2015-07-12 13:58:10 +02:00
Florian Nücke
5a9a6ef3bc Make assembler render without fake full bright to avoid Colored Lights' rendering to break. 
Also added Colored Lights integration while I was at it.
 2015-07-12 13:57:53 +02:00