Commit graph

1017 commits

Author SHA1 Message Date
MauveCloud
fd54912c67 Completed fix for #916
Note: I did test to make sure a silk touch pick would drop the plain
forms instead of the cobblestone variants.
2017-03-12 12:53:08 -07:00
MauveCloud
bff9d64b29 Completed fix for #928 2017-03-12 12:50:47 -07:00
MauveCloud
b0a6788ac4 Improved workaround for #940
Seems to hold up a little better now.  Still haven't figured out what
could be causing only bounds.max to end up null.
2017-03-12 12:49:54 -07:00
Archengius
50b481b4f1 Merge pull request #953 from MauveCloud/1.10.2
Small bugfixes
2017-03-12 11:50:26 +07:00
MauveCloud
ca11db3ff1 Slightly less-hacky workaround for #940
I'm a bit confused that this change works, though, considering the line
number of loadCuboidFace listed in the stack trace.
2017-03-11 20:45:05 -08:00
MauveCloud
9fba3e22a9 1 step toward fixing #928 2017-03-11 20:04:05 -08:00
MauveCloud
ca5e41318f Fix for #924 2017-03-11 20:02:57 -08:00
MauveCloud
1023ecca65 Partial fix for #916 2017-03-11 19:53:10 -08:00
MauveCloud
9da8a7789b Fix for #910 2017-03-11 19:52:16 -08:00
MauveCloud
0c37284c97 Fix for #909 2017-03-11 19:50:00 -08:00
Archengius
f61c77c53c Merge pull request #927 from Chocohead/patch-1
Apply the fixes GT Shim does
2017-03-09 14:34:21 +07:00
Chocohead
2163ddc2d6 Apply the fixes GT Shim does
Clean up block checking too
2017-03-05 22:09:23 +00:00
Dragon2488
8a939b3e72 Merge branch '1.10.2' of https://github.com/Blood-Asp/GT5-Unofficial 2017-02-24 17:05:09 +07:00
Dragon2488
a11ccbdfe3 123456789 2017-02-24 11:18:48 +07:00
Dragon2488
199650139b Crops 2017-02-13 23:02:07 +07:00
Archengius
ad84d8a1c3 Merge pull request #895 from laz2727/1.10.2 2017-02-12 00:30:47 +07:00
laz2727
9ffc099053 Dragon, do your job yourself. 2017-02-11 23:28:44 +06:00
Dragon2488
c5cab28bfa Crops, bugfixes. 2017-02-11 19:29:30 +07:00
Archengius
e14e381ffc Merge pull request #884 from nikita488/1.10.2
Rework rendering
2017-02-01 09:44:34 +07:00
nikita488
120dba42db Rework rendering 2017-01-31 21:08:38 +03:00
Archengius
c98888e2e5 remove ic2 universal cell check 2017-01-27 10:04:57 +07:00
Archengius
18d8f0c338 Merge pull request #876 from 3TUSK/ic2-2.6.151+
[1.10.2] Fix #873
2017-01-27 09:35:31 +07:00
3TUSK
fc400ff7af Merge branch '1.10.2' of https://github.com/Blood-Asp/GT5-Unofficial into ic2-2.6.151+ 2017-01-26 16:46:27 -05:00
3TUSK
0d49510abf Support ic2-2.6.151-ex110, which may break binary compability 2017-01-26 16:42:39 -05:00
Archengius
a86482e02d Merge pull request #872 from codewarrior0/1.10.2-machine-sounds
[1.10.2] Fix machine sounds
2017-01-25 23:00:23 +07:00
David Vierra
210504462c Make GT packets process on the server/client thread instead of netty 2017-01-25 05:46:56 -10:00
David Vierra
721f417a7c Fixed machine sounds 2017-01-25 05:46:51 -10:00
Archengius
4a29abe00a Merge pull request #870 from codewarrior0/1.10.2-redstone-and-covers
[1.10.2] Fix redstone behavior for covers
2017-01-24 21:09:46 +07:00
David Vierra
bd274f64b8 Fix redstone behavior for covers
Tested with Machine Controller and Energy Detector, should work for the
rest too.
2017-01-24 01:17:42 -10:00
Archengius
29465ae392 Merge pull request #869 from codewarrior0/1.10.2-oilrig
Fix a few problems with Oil Drill and AdvMinerII
2017-01-24 16:02:10 +07:00
David Vierra
bf3954e031 Muffle an error when ItemRenderer is called with the wrong itemstack
Occurs with RefinedStorage Patterns when holding shift to show pattern
output, where the output is a GT generic item. The Pattern renderer can
only replace the IBlockModel and not the ItemStack, so the ItemRenderer
gets called with a stack of ItemPattern.

Fixes raoulvdberge/refinedstorage/#914
2017-01-23 22:55:58 -10:00
David Vierra
52c42c2d63 Fix position logic in AdvMiner.checkRecipe (again) 2017-01-23 22:54:53 -10:00
David Vierra
9353ef19bd Fix OilDrill and AdvMiner drilling through bedrock
IC2 doesn't allow us to get an ItemStack for the mining_pipe_tip, so we
grab the IBlockState instead.
2017-01-23 22:54:42 -10:00
Archengius
16115e0faa Merge pull request #866 from codewarrior0/1.10.2-misc-fixes
1.10.2 misc fixes
2017-01-22 13:11:40 +07:00
David Vierra
a6b4cfa3f4 Remove spam in GregTech_API.registerCover 2017-01-21 15:25:32 -10:00
David Vierra
2b80c158bc Fix crash rendering empty electric tool 2017-01-21 15:25:23 -10:00
David Vierra
340c617797 Fix tool colors 2017-01-21 15:25:13 -10:00
David Vierra
959d878c62 Fix Charcoal Pile Igniter incorrectly comparing Blocks against IBlockStates 2017-01-21 15:25:02 -10:00
Dragon2488
317deb43a1 RF support, critical bugfixes. 2017-01-08 15:49:39 +07:00
Archengius
f8515e3b60 Merge pull request #838 from nikita488/test
Latest build.
2017-01-04 18:31:30 +07:00
nikita488
e93f686194 Latest build. 2017-01-04 13:58:52 +03:00
Archengius
addc62f3a0 Fixed getOffsetX/Y/Z and bronze machines. 2017-01-04 16:54:47 +07:00
Dragon2488
e040fcfa94 Bugfixes & latest build. 2017-01-02 13:56:40 +07:00
Dragon2488
76847aa4e7 Huge changes + bugfixes & latest build. 2017-01-01 19:53:17 +07:00
Muramasa-
9df6a3d5f3 Update with unstable changes 2016-12-28 22:11:31 +00:00
Muramasa-
6c2c50a254 Update with 1.10 changes 2016-12-28 21:24:00 +00:00
Muramasa-
c51dc7a383 Fourth pass 2016-12-28 20:16:39 +00:00
Muramasa-
7957b2f4f3 Third pass 2016-12-27 23:48:43 +00:00
Muramasa-
c69a768640 Fix missing Computronics components 2016-12-27 22:42:02 +00:00
Muramasa-
7e3d4ccf4a Port LightningRod (To be changed by Bloody) & Character fix 2016-12-27 21:08:16 +00:00