payonel
ce77d77baf
tab complete fix where whitespace after redirection would not be trimmed
2016-05-28 10:19:13 -07:00
Florian Nücke
f967104b5d
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-28 12:00:11 +02:00
Florian Nücke
7524e6877e
Hopefully fixes color of rendered text bleeding into other tile entity renderers.
2016-05-28 11:59:49 +02:00
Florian Nücke
af9c9cb0f5
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-27 23:55:01 +02:00
Florian Nücke
31d7ac77d6
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 23:54:45 +02:00
Florian Nücke
18f7091c72
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-27 23:52:52 +02:00
Florian Nücke
027b0c2069
Fixed rotatables not getting their onRotationChanged notification when using block state based rotation. Closes #1826 .
2016-05-27 23:52:27 +02:00
Florian Nücke
7ab37217b0
Well that certainly was a fascinating derp to track down.
2016-05-27 23:37:05 +02:00
Florian Nücke
dcd0d12f99
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-27 18:00:39 +02:00
Florian Nücke
3a99e30f40
Fix tile entity renderers turning other stuff transparent (yay no push/popAttrib .-.)
2016-05-27 18:00:24 +02:00
Florian Nücke
ac4b1b7387
Adjust for signature change in writeToNBT.
2016-05-27 17:32:11 +02:00
Florian Nücke
329b66d313
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-27 16:53:21 +02:00
Florian Nücke
080240846e
Also disable JEI recipe handler when loot cycling is disabled.
2016-05-27 16:52:55 +02:00
Florian Nücke
e01e06a8bd
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 16:51:31 +02:00
Florian Nücke
5964911a80
Allow disabling loot disk cycling via config as per special request :P
2016-05-27 16:51:06 +02:00
Florian Nücke
9e5d1522a5
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
2016-05-27 16:47:31 +02:00
Florian Nücke
632f5b7ddb
Underp ticking.
2016-05-27 16:45:56 +02:00
Florian Nücke
474795dd41
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/mcmp/MCMultiPart.scala
2016-05-27 16:17:08 +02:00
Florian Nücke
f1c1c064ae
What do you mean, access to client classes on a server? :P
2016-05-27 16:14:31 +02:00
Florian Nücke
898ba62d09
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-27 15:27:28 +02:00
Florian Nücke
030ebb518d
This is way more weird than I thought...
2016-05-27 15:27:14 +02:00
Florian Nücke
a031b167ea
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Loot.scala
2016-05-27 15:14:41 +02:00
Florian Nücke
ef59cd513f
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Loot.scala
# src/main/scala/li/cil/oc/server/component/DataCard.scala
# src/main/scala/li/cil/oc/server/component/InternetCard.scala
# src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala
2016-05-27 15:13:44 +02:00
Florian Nücke
ae92c73a91
Why IntelliJ, whyyyy? D:
2016-05-27 15:11:57 +02:00
Florian Nücke
ba59e9493f
JEI integration for loot disk recrafting (more or less :P).
2016-05-27 15:07:28 +02:00
Florian Nücke
b03ce8bf3d
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 14:34:48 +02:00
Florian Nücke
0990c09274
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Loot.scala
# src/main/scala/li/cil/oc/common/recipe/Recipes.scala
# src/main/scala/li/cil/oc/server/component/InternetCard.scala
2016-05-27 14:34:37 +02:00
Florian Nücke
4737520b6a
Recipe sorting.
2016-05-27 14:34:08 +02:00
Florian Nücke
896bfa2728
Cleanup.
2016-05-27 13:43:15 +02:00
Florian Nücke
b50d3872ee
Moved all the things! Renamed all the things! Broke all the things!
...
Made most component ROMs into loot disks (except robot for hopefully obvious reasons).
Changed loot disk naming convention (this will break existing loot disks). Closes #1456 .
Made all loot disks craftable by cycling through them by crafting one with a wrench (so e.g. craft OpenOS then cycle through).
2016-05-27 13:33:22 +02:00
Florian Nücke
a93fb7f78e
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/common/block/Printer.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/Redstone.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
# src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
2016-05-26 20:00:42 +02:00
Florian Nücke
7eca6c1a10
Fix lighting issues with print preview in 3d printer.
2016-05-26 19:57:30 +02:00
Florian Nücke
ea37f4db67
Not all things must tick.
2016-05-26 17:34:37 +02:00
Florian Nücke
5624b88151
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/client/renderer/PetRenderer.scala
# src/main/scala/li/cil/oc/util/RenderState.scala
2016-05-26 11:55:56 +02:00
Florian Nücke
726aa36164
Wrap push/popAttrib, don't for now, since it breaks the GlStateManager.
2016-05-26 11:54:53 +02:00
Florian Nücke
2d53f0ce71
Workaround for obfuscation issue leading to AbstractMethodError.
2016-05-25 19:32:45 +02:00
Florian Nücke
cf7ce65a96
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-05-25 18:34:15 +02:00
Florian Nücke
41f51337b0
Porting.
2016-05-25 18:34:01 +02:00
Florian Nücke
bc1107e5cb
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-25 18:33:33 +02:00
Florian Nücke
6e271c79d8
Update player last active time to avoid AFK kicks while working in screens e.g. Closes #1811 .
2016-05-25 18:33:15 +02:00
Florian Nücke
802ba1eee3
1.9.4
2016-05-25 18:20:26 +02:00
Florian Nücke
dd973ae1ab
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# build.properties
2016-05-25 18:19:00 +02:00
Florian Nücke
fa226ab118
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-25 18:17:14 +02:00
Florian Nücke
3e8e94afa1
Update JEI.
2016-05-25 18:07:44 +02:00
Florian Nücke
0817c6de08
Fixed swapping EEPROMs in MCUs. Closes #1814 .
2016-05-25 18:07:07 +02:00
payonel
c819466b04
simplify term hint text indexing and fix lua prompt hint handler
2016-05-24 19:04:33 -07:00
Florian Nücke
7efbb428bf
Store whether tag was written for server or client, so we know how to load it, since the client may feed use either now...
...
Fixed triggering of some sounds.
Also constantify all the tag names .-.
2016-05-21 17:10:09 +02:00
Florian Nücke
7cdf378fd9
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-21 13:44:37 +02:00
Florian Nücke
9e21c3d4f5
Fix setResolution return false even when the resolution changed, closes #1809 .
2016-05-21 13:44:14 +02:00
Florian Nücke
e5b6ea9bb2
Initial portering to 1.9.4.
...
MCMP integration is kinda derpy still (prints don't render correctly when multiparts).
2016-05-20 18:19:29 +02:00
