Florian Nücke
d2f574775c
Don't force using atlas for mountable overlays.
2016-02-27 12:27:00 +01:00
Florian Nücke
80825b3e60
Potential fix for #1648 .
2016-02-27 10:42:05 +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
Florian Nücke
c7f959d4ec
Merge branch 'openos-upgrade-merge' of https://github.com/payonel/OpenComputers into master-MC1.7.10
2016-02-07 12:47:21 +01:00
Florian Nücke
2d28a6e000
Remove __gc from pipes and rename table in guid lib to match lib name.
2016-02-07 12:47:00 +01:00
Florian Nücke
181ddc2019
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2016-02-07 12:46:27 +01:00
Florian Nücke
55b9809493
Oredictify diamonds in recipes. Closes #1637 .
2016-02-07 12:46:04 +01:00
Florian "Sangar" Nücke
ab0587b216
Merge pull request #1640 from ItsTheKais/master-MC1.7.10
...
Mystcraft converters look for correct NBT tag for book name
2016-02-07 12:27:07 +01:00
Florian Nücke
d74c767fca
Sync level of experience upgrade when level changes, closes #1639 .
2016-02-07 11:50:40 +01:00
Florian Nücke
f6d8f08b34
Update BC IToolWrench implementation to new API ( #1636 ).
2016-02-07 11:31:08 +01:00
payonel
7555a9598d
fix cp one file system option and fix no args to time command
2016-02-05 20:36:24 -08:00
ItsTheKais
be45ceda34
Fixes Mystcraft integration looking for wrong name tag
2016-02-05 21:20:18 -07:00
payonel
c414f7428d
openos 1.6 upgrade: new bin utils, memory optimizations, and bug fixes
2016-02-02 00:19:42 -08:00
Florian Nücke
9530918afe
Updated to new Waila API, closes #1559 .
2016-01-31 20:19:52 +01:00
Florian Nücke
55dd320b2a
Merge branch 'patch-2' of https://github.com/SoniEx2/OpenComputers into master-MC1.7.10
2016-01-31 17:58:48 +01:00
Florian Nücke
c1749efb2d
Log restored chunk loader ticket locations, closes #1616 .
2016-01-31 17:58:13 +01:00
Florian Nücke
6ef92b9ef5
Better screen fixery. I hope.
2016-01-31 17:56:37 +01:00
Soni L
07f452125c
Fix __gc and use raw metatable when it's disabled
...
This fixes a small __gc abuse I found, and also uses the raw metatable in a safe way when __gc is disabled. Both were tested.
2016-01-31 14:46:52 -02:00
Florian Nücke
ac64edd1c7
Properly send viewport size in text buffer init, should fix #1609 .
2016-01-31 17:13:35 +01:00
Florian Nücke
969e6ebf94
Fixed (harmless) occasional warnings in sound system when computer errored when powering on. Closes #1558 .
2016-01-31 16:58:52 +01:00
Florian Nücke
c7621294d3
Get rid of usages of __gc. Closes #1606 .
...
Wrapping file handles with userdata that has a `dispose` closing the handle.
Internet card already closed via userdata, so nothing to do there.
Removed cleanup logic from term, deal with it.
Added setting to re-enable it, if you really really need it.
2016-01-31 15:58:40 +01:00
Florian Nücke
3b0082303e
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2016-01-31 14:46:11 +01:00
Florian Nücke
45d8a20118
Fix potentially unexpected behavior when using custom __pairs for metatables. Closes #1625 .
2016-01-31 14:45:48 +01:00
Florian "Sangar" Nücke
a14c7cf973
Merge pull request #1628 from habnabit/ae2-cpu-selection
...
Allow specifying AE2 CPU when crafting
2016-01-31 14:09:23 +01:00
Florian "Sangar" Nücke
bc100426bc
Merge pull request #1622 from Landrash/patch-1
...
Mycroft Holmes
2016-01-31 13:57:21 +01:00
Florian "Sangar" Nücke
ef2c70a77b
Merge pull request #1617 from gamax92/debug-playSoundAt
...
Added `playSoundAt` to debug card.
2016-01-31 13:53:12 +01:00
Aaron Gallagher
c1181babd6
Allow specifying AE2 CPU when crafting.
2016-01-24 09:12:37 -08:00
Landrash
0cbd75be0a
Mycroft Holmes
...
Suggestion to add Mycroft Holmes to the List of robot names.
From the book The Moon Is a Harsh Mistress.
Qoute from Wikipedia - https://en.wikipedia.org/wiki/The_Moon_Is_a_Harsh_Mistress
Mike, alias 'Adam Selene', alias 'Simon Jester', alias 'Mycroft Holmes', officially an augmented HOLMES IV system, is a supercomputer empowered to take control of Lunar society, who achieved self-awareness when his complement of "neuristors" exceeded the number of neurons in the human brain.
2016-01-19 17:55:01 +07:00
Florian Nücke
8470226874
Reenable IHasWork for BuildCraft, closes #1618 .
2016-01-16 13:45:07 +01:00
gamax92
457e18be64
Added playSoundAt to debug card.
2016-01-15 15:00:56 -07:00
Florian "Sangar" Nücke
96ee1ec6e6
Merge pull request #1612 from magik6k/deps
...
Use coloredlightscore jenkins
2016-01-15 21:23:15 +01:00
Florian Nücke
811759314d
Version bump.
2016-01-15 21:12:04 +01:00
Florian Nücke
0ba31b7be0
Less copy-pasta-y doc for viewport.
2016-01-15 21:09:54 +01:00
Florian Nücke
49fbe0eef1
Should fix #1589 .
2016-01-15 21:07:15 +01:00
Florian Nücke
fbd57de086
Patched Eris 5.3.
2016-01-15 21:04:53 +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 "Sangar" Nücke
11606c7be6
Merge pull request #1603 from cyber01/RU_doc
...
Russian translation for Trading Upgrade/TIS-3D integration.
2016-01-12 19:25:57 +01:00
cyber01
9976b64100
Trading Upgrade/TIS3d
2016-01-06 19:47:57 +03:00
Florian Nücke
e7f0384666
Added Rack.indexOfMountable.
2016-01-06 13:24:18 +01:00
Florian Nücke
fe99d6867c
Should fix #1589 .
2016-01-06 13:13:38 +01:00
Florian Nücke
bbedc984bb
Closes #1602 .
2016-01-06 12:52:11 +01:00
Florian Nücke
58899fb82e
Implemented gpu.setViewport.
2016-01-05 15:41:18 +01:00
Florian Nücke
c3e44af3f6
Take into account NBT when trying to extract item of specified stack type from inventory.
2016-01-04 18:44:52 +01:00
Florian Nücke
58de9015c3
Refactored a few things out of the trading upgrade into InventoryUtils, making things a little more consistent, added manual entry for trade upgrade, tweaked the texture for the trade upgrade a bit.
2016-01-04 18:41:40 +01:00
Florian Nücke
7af4b41b1e
Merge branch 'UpgradeTrading' of https://github.com/Inari-Whitebear/OpenComputers-TradingUpgrade into master-MC1.7.10
2016-01-04 15:03:47 +01:00
Florian Nücke
a95fa2049e
Moved hacky variable to SaveHandler, which totally makes it not a hack anymore.
...
Seriously though, the alternatives I see would not be better in the least, since passing that state along would be completely unnecessary in 99% of the cases, but would break *everything*. Literally. All. The. Things. So this one's here to stay.
2016-01-04 14:20:23 +01:00
Negi Springfield
e6a97f046a
Add trading upgrade icon
2016-01-03 17:30:03 +01:00
Inari
721bc9b9a2
Add trading card upgrade code, recipes, config options, and language names (for EN/DE)
2016-01-03 17:29:52 +01:00
