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
|
ed18a71b2f
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-03-12 13:34:42 +01:00 |
|
Florian Nücke
|
6b073bfa36
|
Trying to prevent #1684, #1685.
|
2016-03-12 13:34: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
|
4c5806eb1a
|
Re-enable Thaumcraft integration (untested).
|
2016-03-12 12:40:17 +01:00 |
|
Florian Nücke
|
959ef97a9c
|
Update Thaumcraft API.
|
2016-03-12 12:35:10 +01:00 |
|
Florian Nücke
|
c3b5741cea
|
Wording.
|
2016-03-09 22:28:19 +01:00 |
|
Florian Nücke
|
f4ac128388
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-03-09 21:11:10 +01:00 |
|
Florian Nücke
|
166df967ac
|
OK, OK, I'll stop being lazy already.
|
2016-03-09 21:08:45 +01:00 |
|
Florian Nücke
|
0bdf3afc94
|
Goodbye unifont, hello unscii (thanks to @asiekierka).
|
2016-03-09 20:55:37 +01:00 |
|
Florian Nücke
|
4cfbf128e0
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
|
2016-03-09 20:17:29 +01:00 |
|
Florian "Sangar" Nücke
|
2e4e337f78
|
Merge pull request #1680 from cyber01/RU_doc
Updated hoverBoots description
|
2016-03-09 20:14:33 +01:00 |
|
payonel
|
c7715382fd
|
term crash guard for writes before binding, and resize support
|
2016-03-08 14:46:22 -08:00 |
|
payonel
|
cfe97d8327
|
fix term ctrl key (regression), fix grep display
|
2016-03-03 15:47:33 -08:00 |
|
cyber01
|
c89246a8ad
|
Updated hoverBoots description
|
2016-03-03 00:15:46 +03:00 |
|
Florian Nücke
|
dbd82e40ad
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-03-02 19:03:04 +01:00 |
|
payonel
|
a4dc3e3517
|
fix click cursor, add ctrl+move to jump words, and fix 1st tab
|
2016-03-02 08:06:31 -08:00 |
|
Florian Nücke
|
e7a802c3ae
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-03-01 22:19:07 +01:00 |
|
Florian Nücke
|
add0b6f936
|
More stable network merging of networks containing nodes with duplicate addresses.
Specifically when the duplicate node being re-addressed was a "bridge" node.
|
2016-03-01 22:18:52 +01:00 |
|
Florian Nücke
|
f3932b6336
|
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
|
2016-03-01 21:58:06 +01:00 |
|
Florian Nücke
|
27a06a3490
|
Fixed server rack not properly re-rendering when adding/removing mountables.
|
2016-03-01 21:57:56 +01:00 |
|
Florian Nücke
|
c7931a76ab
|
Merge branch 'next-term' of https://github.com/payonel/OpenComputers into master-MC1.7.10
|
2016-03-01 20:23:05 +01:00 |
|
payonel
|
02531670d9
|
new term library, faster, light-weight, better widechars
|
2016-02-29 17:43:26 -08:00 |
|
Florian Nücke
|
3b64c413cf
|
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/MethodWhitelist.java
# src/main/java/li/cil/oc/api/driver/NamedBlock.java
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
|
2016-02-27 19:33:16 +01:00 |
|
Florian Nücke
|
22495b9e50
|
Make adapter use new SidedBlock drivers. Updated some more JDoc.
|
2016-02-27 19:30:59 +01:00 |
|
Florian Nücke
|
4780e86b96
|
Call Architecture.onSignal outside all locks. Closes #1672.
|
2016-02-27 19:24:21 +01:00 |
|
Florian Nücke
|
45da10c8f1
|
Fix terminal server texture in non-dev.
|
2016-02-27 13:43:55 +01:00 |
|
Florian Nücke
|
62497680b8
|
Nope.
|
2016-02-27 13:39: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
|
d2f574775c
|
Don't force using atlas for mountable overlays.
|
2016-02-27 12:27:00 +01:00 |
|
Florian Nücke
|
44e771cb75
|
Limit max number of items crafted in one command to one stack, closes #1651.
Prevents semi-infinite loops for identity-crafting (i.e. input == output).
|
2016-02-27 11:33:12 +01:00 |
|
Florian Nücke
|
13cff88dc1
|
Fixed recipe sorting.
|
2016-02-27 11:29:57 +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
|
80825b3e60
|
Potential fix for #1648.
|
2016-02-27 10:42:05 +01:00 |
|
Florian Nücke
|
0613237fc6
|
Cleanup.
|
2016-02-24 20:22:19 +01:00 |
|
Florian Nücke
|
49a0f8560c
|
Say no to sideonly fields!
|
2016-02-24 20:21:36 +01:00 |
|
Florian Nücke
|
f85c441a1a
|
Merge branch 'master-MC1.7.10' of https://github.com/tim4242/OpenComputers into master-MC1.7.10
|
2016-02-24 20:13:19 +01:00 |
|
Florian Nücke
|
593ae97a6f
|
Merge branch 'cp-x' of https://github.com/payonel/OpenComputers into master-MC1.7.10
|
2016-02-24 20:07:34 +01:00 |
|
Florian Nücke
|
6c050032a3
|
Organize imports.
|
2016-02-24 19:59:35 +01:00 |
|
Florian Nücke
|
bb3b9fd4cd
|
Merge branch 'dyeable-hoverboots' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
|
2016-02-24 19:30:30 +01:00 |
|
Florian Nücke
|
94721f03ea
|
Super minor cleanup.
|
2016-02-24 19:30:04 +01:00 |
|
Florian Nücke
|
c900edf86e
|
Fixing tons of rendering stuffs and such.
|
2016-02-23 23:30:43 +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 |
|
Vexatos
|
b2105d9963
|
Added information on dyeing to the manual.
|
2016-02-22 22:44:08 +01:00 |
|
Vexatos
|
1f13395dcc
|
Made hover boots lose their colour when tossed into a cauldron.
|
2016-02-22 22:14:36 +01:00 |
|
Vexatos
|
726ceae91f
|
Made Hover Boots dyeable.
|
2016-02-22 14:36:03 +01:00 |
|
tim4242
|
f5d347e2e2
|
Modernized PetRenderer
- Made player checking UUID based
- Made in inventory detection better
|
2016-02-20 17:51:04 +01:00 |
|
DrummerMC
|
f76f2448c7
|
Disable ThaumicEnergistics by default
|
2016-02-14 13:06:24 +01:00 |
|
DrummerMC
|
590ecebc33
|
Add ThaumicEnergistics support
|
2016-02-14 00:07:40 +01:00 |
|