Commit Graph
2811 Commits
Author SHA1 Message Date
Lizbeth Rika 5a697264a1 Fixed the Drum of the Gathering working on the client side. Closes #926 2015-05-12 16:55:36 +01:00
Lizbeth Rika 17df65717b Actually make them not connect >.< 2015-05-12 16:49:35 +01:00
Lizbeth Rika d51dea59b2 Red Stringed Spoofers can't connect to botania special flowers any more. Closes #934. 2015-05-12 16:45:31 +01:00
Lizbeth Rika a59d13ff06 Made the Gaia Guardian only remove ambient potion effects. Closes #925 2015-05-12 16:38:50 +01:00
Lizbeth Rika 1d377b8889 Fixed crash when corporea funnels or interceptors have empty item frames. Closes #897 2015-05-12 16:18:55 +01:00
Lizbeth Rika 559d51c529 PR fixes. 2015-05-12 15:42:19 +01:00
Lizbeth Rika c4173e1595 Merge pull request #945 from Mrkwtkr/patch-4
Update zh_CN.lang
2015-05-12 14:58:17 +01:00
Lizbeth Rika 2060ba2a26 Merge pull request #943 from Lazersmoke/patch-1
Copy/Paste from previous pull for Helm Crafting
2015-05-12 14:58:11 +01:00
Lizbeth Rika 630535e43e Merge pull request #938 from tterrag1098/patch-2
Use the stack sensitive unloc name in seed matcher
2015-05-12 14:57:23 +01:00
Lizbeth Rika addef9f0c9 Merge pull request #937 from Lazersmoke/patch-3
Fix Thor ring giving SS achievement when using S pick
2015-05-12 14:57:16 +01:00
Lizbeth Rika aafbf19e14 Merge pull request #933 from NatsuArashi/patch-5
Update zh_TW.lang
2015-05-12 14:57:09 +01:00
Lizbeth Rika cdc9cfebc4 Merge pull request #929 from Lazersmoke/patch-5
Fix using wrong y coord variable
2015-05-12 14:55:02 +01:00
Dylan4ever 4ac13bd418 Fuck yeah, I'm back. I didn't actually change anything though. Kek. 2015-05-11 19:34:09 +02:00
Mrkwtkr d907fa225f Update zh_CN.lang
Translated the relics of the aesir, the shattering and some achievements.
2015-05-11 12:27:40 +08:00
Sam Quinn 9958cafd9e Copy/paste from previous
see previous pull request
2015-05-10 20:36:56 -05:00
Sam Quinn 1ef947c6d9 Fix using wrong y coord variable 2015-05-10 20:30:10 -05:00
tterrag1098 c4beac7172 Use the stack sensitive unloc name in seed matcher
Fixes KitchenCraft seeds not working with the apothecary
2015-05-10 02:20:57 -04:00
Lizbeth Rika 95895b14bb Merge pull request #924 from Mrkwtkr/patch-1
Update zh_CN.lang
2015-05-09 23:00:43 +01:00
NatsuArashi fc7b071bc6 Update zh_TW.lang
Well... Fixed alot
2015-05-10 00:34:28 +08:00
Sam Quinn 38099b7c44 Fix using wrong y coord variable
totally my mistake :(
2015-05-08 18:38:53 -05:00
Mrkwtkr 1e0a51ef99 Update zh_CN.lang
Finally :P
2015-05-08 12:50:16 +08:00
Lizbeth Rika 03dc9301c3 Merge pull request #892 from MrKunji/patch-13
Update en_US.lang
2015-05-07 18:51:58 +01:00
Lizbeth Rika 1316c00f9a Update contributing.md 2015-05-07 18:24:19 +01:00
Lizbeth Rika 868b99cd76 Update contributing.md 2015-05-07 18:23:14 +01:00
Sam Quinn 57339110b3 Fix Thor ring give SS achievement when using S pick 2015-05-06 15:37:11 -05:00
Lizbeth Rika f1f6083a5f Merge pull request #906 from Reyls/patch-1
Update de_DE.lang
2015-05-06 12:21:42 +01:00
Lizbeth Rika 5736ea149b Merge pull request #909 from NatsuArashi/patch-3
Update zh_TW.lang
2015-05-06 12:21:30 +01:00
NatsuArashi acdd7726ce Update zh_TW.lang 2015-05-06 19:19:16 +08:00
wiiv e5be4c91bd Stone of Temperance. 2015-05-05 21:04:35 +01:00
Reyls a47a17f9c9 Update de_DE.lang
correct links
2015-05-05 15:46:57 +02:00
Lizbeth Rika 5748450629 Merge pull request #895 from puyo061/patch-6
Update ko_KR.lang
2015-05-04 13:30:05 +01:00
찐빵 9e5caf084f Update ko_KR.lang 2015-05-04 09:20:29 +09:00
Patric Alexandre a6d9d176ee Update en_US.lang 2015-05-03 14:42:19 -03:00
Lizbeth Rika 9c64f9c234 Merge pull request #891 from Lazersmoke/master
Reversed issued Zodiacs closes #887
2015-05-03 16:32:44 +01:00
Sam Quinn 0d5ba17444 Flipped the things
Signs 9 and 10 in the Zodiac were backwards, now fixed
2015-05-03 10:25:52 -05:00
Lizbeth Rika 4ad0012ea4 Merge pull request #890 from hupster/patch-1
Update nl_NL.lang
2015-05-03 15:51:12 +01:00
hupster 5c9faa3771 Update nl_NL.lang 2015-05-03 16:31:08 +02:00
Lizbeth Rika 7ff913d4f6 Merge pull request #874 from Sinhika/master
fixed mis-named file, added ores from Simple Ores & akkamaddi's Additions
2015-05-03 14:06:02 +01:00
Lizbeth Rika 46f7a65e3c Merge pull request #886 from puyo061/patch-11
Update ko_KR.lang
2015-05-03 14:04:55 +01:00
Lizbeth Rika 2840f13ffc Merge pull request #887 from Kolatra/fixStarTypo
Fix Star Signs Typo
2015-05-03 14:04:51 +01:00
Tyler 781e1a667d Update en_US.lang 2015-05-03 01:59:52 -06:00
찐빵 a713a6f0af Update ko_KR.lang 2015-05-03 15:25:35 +09:00
Sinhika fd2eaef2ce updated API version 2015-05-02 20:48:23 -05:00
Lizbeth Rika 2a29878fcd Merge pull request #873 from Lazersmoke/patch-2
Fixes rendering default Loki/Aesir origin...
2015-05-03 01:42:10 +01:00
Lizbeth Rika c8ff7b2c05 Merge pull request #876 from puyo061/patch-7
Update ko_KR.lang
2015-05-03 01:40:27 +01:00
찐빵 791cebce05 Update ko_KR.lang 2015-05-03 09:07:15 +09:00
Sinhika 46e3d8f2d5 fixed mis-named file, tweaked nether ores from Simple Ores 2015-05-02 17:50:58 -05:00
Sam Quinn 0ac4616870 Fixes rendering default Loki/Aesir origin...
wireframe, and doesn't break anything else, as all outlines will be in the world (greater than y=-1) closes #872
2015-05-02 17:22:57 -05:00
Lizbeth Rika 4816dc25b1 Build 187. 2015-05-02 17:35:50 +01:00
Lizbeth Rika f1f1964a04 Added an achievement for breaking the game. 2015-05-02 17:30:39 +01:00