Commit Graph
4880 Commits
Author SHA1 Message Date
Vincent Lee ddcff076a7 Cleanup and pull unneeded stuff out of datawatcher 2016-08-20 16:44:27 -05:00
Vincent Lee 9e56e04e6c Remove potions more cleanly 2016-08-20 16:32:37 -05:00
Vincent Lee b91ab69cea Remove unneeded world arg from particle methods 2016-08-20 14:38:24 -05:00
Vincent Lee d12717c29f Get rid of silly common proxy pattern 2016-08-20 14:31:25 -05:00
Vincent Lee 808d80affa Add note to refresh rendering after toggling config option 2016-08-19 20:33:32 -05:00
Vincent Lee 6478eb907e Localize config option 2016-08-19 20:21:14 -05:00
Vincent Lee 334d910086 Merge branch 'master' of github.com:williewillus/Botania 2016-08-19 20:19:11 -05:00
Vincent Lee 1b97974d0e Add config to render floating flowers in static renderer 2016-08-19 20:19:00 -05:00
Vincent Lee 2fe7d5e025 Slightly more efficient quad gathering 2016-08-19 19:57:51 -05:00
Vincent Lee 360a398fca Delete old model 2016-08-19 19:54:41 -05:00
Vincent Lee a9171cd215 Merge branch 'improvedfloaters' 2016-08-19 19:53:47 -05:00
Vincent Lee 815cdc9f52 Fix all textures 2016-08-19 16:09:18 -05:00
Vincent Lee 0a235cf5e8 Finish UV remapping 2016-08-19 15:12:52 -05:00
Vincent Lee 25a4877e1a Halved the texture size 2016-08-19 12:52:22 -05:00
Vincent Lee 28febcac08 UV map the bottom of the model. Add placeholders for sides 2016-08-19 12:42:30 -05:00
Vincent Lee 757abbe6d7 Merge pull request #448 from 3TUSK/zhCN
Update zh_CN.lang
2016-08-16 20:57:36 -05:00
3TUSK 28aa8bc0d5 Update zh_CN.lang
Signed-off-by: 3TUSK <[email protected]>
2016-08-16 21:20:42 -04:00
Vincent Lee 5392f00ff9 Fix orechid running clientside, closes #447 2016-08-16 18:09:06 -05:00
Vincent Lee 64712d315f WIP 2016-08-15 17:14:40 -05:00
Vincent Lee 789832bdc1 Merge branch 'master' into improvedfloaters 2016-08-15 15:55:50 -05:00
Vincent Lee a0a7428116 Bergamute now blocks moving/ticking sounds. Closes #407 2016-08-15 15:52:51 -05:00
Vincent Lee 37eb1a781c Fix bergamute having a nonmatching color 2016-08-15 15:34:06 -05:00
Vincent Lee a0a78ea203 Build 316 r1.8-316 2016-08-15 13:43:18 -05:00
Vincent Lee ba3f337520 Remove moss stone botaina recipe, remove old tooltips 2016-08-15 12:11:51 -05:00
Vincent Lee 9e13eda148 Add missing sideonly to blocks 2016-08-15 12:00:51 -05:00
Vincent Lee 4f26ea9893 Use vanilla mechanisms to sync TE's instead of rolling own 2016-08-14 11:46:45 -05:00
Vincent Lee 878c0dbeba Make ender hand less desyncy and clean some old filesy 2016-08-14 10:46:10 -05:00
Vincent Lee 687d475aeb Corporea no longer runs clientside 2016-08-13 15:21:32 -05:00
Vincent Lee 1eafb2e85e Update forge, fix tooltips additions not matching item tooltip. Closes #219 2016-08-13 14:26:10 -05:00
Vincent Lee 2877d304ce Mana blaster now shows active lens on model 2016-08-13 12:50:17 -05:00
Vincent Lee dc1eab4dd8 Fix weird model name clash. Closes #436 2016-08-12 22:17:12 -05:00
Vincent Lee f71b4b6cf2 Fix all other potatoes. Closes #409 2016-08-12 21:41:27 -05:00
Vincent Lee 2b3cfd985c Don't spam quite so many stacks 2016-08-11 21:00:04 -05:00
Vincent Lee 2a4b489eca Bunch more potato fixes, and one for me! 2016-08-11 20:38:54 -05:00
Vincent Lee 348b52eb9f Fix some of the easier potatoes 2016-08-11 19:50:01 -05:00
Vincent Lee 12be321b73 Merge pull request #433 from yrsegal/potatoes
Do initial work on potatoes
2016-08-11 18:27:12 -05:00
Vincent Lee 07f68b37da Fix missing sideonly 2016-08-09 21:04:09 -05:00
Vincent Lee 8d9996cb6b Fix corporea retainer comparator output not working. Closes #430 2016-08-09 19:57:41 -05:00
Vincent Lee 32a28e83a5 Magic flowers now show properly in JEI. Closes #431 2016-08-09 19:48:54 -05:00
Vincent Lee 0b34fe7193 Fix porting derp in flare lens. Closes #429 2016-08-08 20:17:22 -05:00
Vincent Lee a3e8d88f1c Fix a corproea animation being absent 2016-08-07 20:10:44 -05:00
Vincent Lee 8423607b29 Reinstate null subtile check. Closes #428 2016-08-07 18:30:31 -05:00
Vincent Lee 90c42b25c7 Get rid of some triple nested for loops 2016-08-07 12:27:01 -05:00
Vincent Lee ddda9db4ac Make bubbell less laggy 2016-08-07 12:00:52 -05:00
Vincent Lee 16615ce429 Tweak cacophonium interactions 2016-08-06 12:04:18 -05:00
Vincent Lee aeaa2a76c4 Tweak black hole talisman interactions, fix a crash 2016-08-06 11:48:01 -05:00
Vincent Lee 921825aca3 Fix pickup delay not getting set properly in thrown items 2016-08-05 20:59:05 -05:00
Vincent Lee c3e4a02825 A few inconsequential cleanups 2016-08-05 20:51:21 -05:00
Vincent Lee 3d7c9e8b94 Update forge, remove some unneeded particle methods 2016-08-05 20:21:50 -05:00
Vincent Lee a0aac5a9bf Stupid compile derp 2016-08-05 18:36:04 -05:00