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

31 Commits

Author SHA1 Message Date
Florian Nücke
1adb34ab3c Fixed a few compile errors. 2017-03-25 12:55:57 +01:00
Florian Nücke
ece9663814 Moar Javaification. More breaking stuff. 2017-03-12 16:23:43 +01:00
Florian Nücke
e008bbdf89 More flamethrower refactoring. 2017-03-10 20:46:54 +01:00
Florian Nücke
1885132f6c Rip and tear. 2017-03-07 18:44:55 +01:00
Vexatos
3b29bcd977 Update to 1.11. Fixed most compile errors. 2017-02-09 12:38:08 +01: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
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
df269a5bbe Added driver.SidedBlock interface, deprecated old driver.Block interface, closes #1650. 
Made CompoundBlockDriver support both kinds.
 2016-02-27 11:23:11 +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
323f823506 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
 2015-04-21 13:16:30 +02:00
Florian Nücke
8a31eba5c3 Removed use of a few remaining reflection thingers, since we have an oc_at.cfg now anyway. 2015-04-21 11:36:23 +02:00
Florian Nücke
982bc8d1bb Welp, guess we're using metadata to store rotation and shit now. 
Also organized imports.
 2014-12-28 23:09:08 +01:00
Florian Nücke
3b578e71a6 Started porting to MC1.8. Starts for now, but rendering is still broken as hell. 2014-12-26 04:08:00 +01:00
Florian Nücke
7faa309388 Fixes #645. 2014-11-03 14:36:43 +01:00
Florian Nücke
e35dfb960a Organized imports, splitting up multi imports of the format import pkg.{a, b, c} since those are a pain when merging stuff after imports changed. 2014-10-05 16:25:49 +02:00
Florian Nücke
3841fb4759 Got rid of component.ManagedComponent in favor of dogfooding prefab.ManagedEnvironment. 2014-10-05 16:19:19 +02:00
Florian Nücke
272b9000ff Added priority getter to NamedBlock interface. 2014-10-05 15:17:35 +02:00
Florian Nücke
cf521f4b2a Organize the imports. ALL OF THEM. 2014-06-19 16:23:26 +02:00
Florian Nücke
177edc9bf6 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/java/li/cil/oc/api/FileSystem.java
	src/main/java/li/cil/oc/api/detail/FileSystemAPI.java
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/Loot.scala
	src/main/scala/li/cil/oc/OpenComputers.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/Sound.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/gui/Case.scala
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/client/gui/Icons.scala
	src/main/scala/li/cil/oc/client/gui/ImageButton.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
	src/main/scala/li/cil/oc/client/gui/Server.scala
	src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/item/UpgradeRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/Sound.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Delegator.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/Rack.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
	src/main/scala/li/cil/oc/common/item/InternetCard.scala
	src/main/scala/li/cil/oc/common/item/NetworkCard.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
	src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala
	src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala
	src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSign.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala
	src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
	src/main/scala/li/cil/oc/common/multipart/MultiPart.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
	src/main/scala/li/cil/oc/server/component/Redstone.scala
	src/main/scala/li/cil/oc/server/component/Server.scala
	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
	src/main/scala/li/cil/oc/server/driver/item/CC15Media.scala
	src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala
	src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
	src/main/scala/li/cil/oc/util/ExtendedNBT.scala
	src/main/scala/li/cil/oc/util/TextBuffer.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft15.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft16.scala
 2014-05-29 13:26:15 +02:00
Florian Nücke
ddd8e18aef Fixed robot energy storage somewhat. 
Improved picking of robots (avoid duplicate component ids).
 2014-05-23 18:55:19 +02:00
Florian Nücke
0acecde4e6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-06 19:19:47 +02:00
Florian Nücke
0119aa1d46 Corrected documentation on MethodWhitelist (it goes into environments, not drivers). 
Deprecated NamedBlock going into drivers, it should go into environments now (it being in drivers will no longer be supported in OC 1.3).
 2014-04-06 19:17:18 +02:00
Florian Nücke
ef5f1f7bcf Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
 2014-04-06 15:02:59 +02:00
Florian Nücke
39f83ae7c1 Added method whitelisting interface for drivers, to customize which methods should be shown for the blocks they support. 2014-04-05 18:44:03 +02:00
Florian Nücke
97353c44ee going gradle 2014-03-06 21:35:36 +01:00
Florian Nücke
5609bb4c93 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
 2014-03-05 19:29:17 +01:00
Florian Nücke
4f69925cb8 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
 2014-02-18 22:58:41 +01:00
Florian Nücke
2f3f52adc1 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Also updated srg names where used.

Conflicts:
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
 2014-02-10 03:45:15 +01:00
Florian Nücke
ccb5e54f44 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 16:38:00 +01:00
Florian Nücke
4e71de049a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
 2014-02-08 16:15:59 +01:00
Florian Nücke
c3d4c11d86 moved stuff around to be where gradle needs it 2014-02-07 14:45:53 +01:00