Commit graph

888 commits

Author SHA1 Message Date
Exidex
dcf73d5e4b Delete block mechanics for tools as vanilla now has shields 2017-04-09 20:02:10 +02:00
Archengius
3e4a970f5e Merge pull request #1015 from Exidex/cleanup
Delete some more unused staff
2017-04-09 00:03:42 +07:00
Exidex
79e02cd526 Delete some more unused staff 2017-04-08 15:32:41 +02:00
Archengius
85a09fd03e Merge pull request #1014 from Exidex/cleanup
some (useless) cleanup
2017-04-08 19:24:32 +07:00
Exidex
3751e743e9 Delete some unused staff 2017-04-08 14:12:19 +02:00
Archengius
d3db4232a3 test webhooks
Optional descriptikn
2017-04-06 20:41:57 +07:00
Archengius
101e7604f3 Merge pull request #1007 from sixdev/1.10.2
Updated mappings.
2017-04-06 08:51:18 +07:00
SixDev
c3a3c3a36c Fixed compilation error from updating forge 2017-04-05 17:22:28 +02:00
SixDev
18b2a11285 Update Forge version 2017-04-05 17:18:04 +02:00
SixDev
a98e04bebb Added build dir from IntelliJ to gitignore 2017-04-05 17:17:52 +02:00
Sixten Revström
104297f9c5 Fixed IntelliJ thinking it was Java 6 2017-04-05 16:31:45 +02:00
Archengius
09f3b407ad Merge pull request #1001 from Exidex/patch-2
Fixed right click behavior.
2017-04-02 23:26:20 +07:00
Exidex
8475937153 Addition to Fix right click behavior for metaitems. 2017-04-02 01:54:12 +02:00
Exidex
dc984eaacf Fixed right click behavior. 2017-04-01 20:26:53 +02:00
Archengius
2173e4fffe Merge pull request #954 from MauveCloud/1.10.2
More minor bugfixes
2017-03-22 12:19:56 +07:00
MauveCloud
b61732677f Fix for #970 2017-03-21 17:37:03 -07:00
MauveCloud
6df81f11cd Fix for #915
Also includes a fix for the inherited bug from 5.09 that prevented
intentionally generating marble and basalt in the Nether.
2017-03-21 14:45:06 -07:00
MauveCloud
b5f80e6820 Updated and corrected mcmod.info file
Mod description now shows up in Forge mods menu, and shows as "5.10"
instead of "5.09" in launchers that show mod versions.
2017-03-15 08:59:17 -07:00
MauveCloud
8c3eb4c360 Fix for #962 2017-03-14 13:25:41 -07:00
MauveCloud
36e8584e4c Partial fix for #955
Restores ability to use different explosives.
2017-03-14 10:00:51 -07:00
MauveCloud
b439073dfa Fix for #907 2017-03-12 15:23:12 -07:00
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