Commit Graph
2874 Commits
Author SHA1 Message Date
Vasco Lavos 2e0d8ed8a5 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-09-02 16:45:50 +01:00
Vasco Lavos e0bebe5d2a Fix weird preview animations at high framerates 2017-09-02 16:45:41 +01:00
Vincent Lee dbb61cf855 Revert new default lexicon icon/model for now 2017-09-02 10:39:09 -05:00
Vasco Lavos b79377b901 Narslimmus buff 2017-09-02 16:31:18 +01:00
Vasco Lavos 3f39f5aad1 Revert "Terrasteel now made in nugget amounts, alf portal and natura pylon made cheaper"
This reverts commit ef9efb0dfe.
2017-09-02 16:29:36 +01:00
Vasco Lavos 872e98a5b0 Revert more number changes 2017-09-02 16:29:27 +01:00
Vasco Lavos 99a5a2a7ba Revert number changes 2017-09-02 16:28:49 +01:00
Vasco Lavos 27ea4e2db8 Revert terrasteel nuggets 2017-09-02 16:27:28 +01:00
Vasco Lavos 93a845a1b8 Fixed some warnings 2017-09-02 16:13:42 +01:00
wiiv f7297534e2 If nothing explodes, the art overhaul is done! 2017-09-02 14:41:34 +01:00
Vincent Lee e32ce47f53 Merge pull request #2340 from gerhard2202/shaky-lexicon-fix
Fixes the shaking mouse-over elements in the Lexicon.
2017-09-01 22:55:52 -05:00
gerhard2202 a9a1ffd195 Changed my fix to use the new partial ticks instead of the old ones and updated the variable names to be more descriptive. 2017-09-01 20:15:44 -04:00
Vincent Lee 9219008845 Merge pull request #2341 from gerhard2202/band-of-aura-crash-fix
Fixes the crash when trying to view the recipe for the Band of Aura
2017-08-28 23:12:14 -05:00
gerhard2202 0093da7ceb Fixes the alchemy catalyst eating everything and never giving anything back.
The issue was that mini flower recipes were being registered before the specialFlower block item was registered, so the recipes for mini flowers were defaulting to having an input and output of Air blocks, breaking all the alchemy recipes.
2017-08-28 22:14:54 -04:00
gerhard2202 ee8f6876f2 Fixes the shaking mouse-over elements in the Lexicon. 2017-08-28 22:11:01 -04:00
gerhard2202 08a990300e Fixes the crash when trying to view the recipe for the Band of Aura in the Lexicon. 2017-08-28 22:06:31 -04:00
wiiv 03a96edb44 More asset changes for the art update. 2017-08-28 02:58:29 +01:00
wiiv 7ff0fd2d18 Another batch of the art update. 2017-08-24 05:29:44 +01:00
Vincent Lee 00d650926a Workaround for #2303 2017-08-22 12:18:08 -05:00
Vincent Lee fa5059a883 Break GG onLivingUpdate method apart a bit so it's easier to read 2017-08-21 15:22:53 -05:00
Vincent Lee df0d9efefc Pylon items render correctly 2017-08-20 14:57:08 -05:00
Vincent Lee 079300fdbd Munchdew has visual cooldown feedback. closes #2315 2017-08-20 14:39:07 -05:00
Vincent Lee 34005c4a62 Minor cleanup in lexicon 2017-08-20 14:23:06 -05:00
Vincent Lee 4eac5e44c4 Fix #2330 2017-08-20 12:23:08 -05:00
Vincent Lee 9fa41e68b3 Fix a couple broken texture paths 2017-08-19 23:55:55 -05:00
Vincent Lee 3f41aa0943 Fix pylon item model (kind of) 2017-08-19 23:37:33 -05:00
Vincent Lee 443de41647 Attempt to fix pylon model rendering 2017-08-19 23:17:59 -05:00
Vincent Lee f3f66401f7 Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-08-19 22:53:41 -05:00
wiiv 4b4fa5560e First art revamp commit! 2017-08-19 10:31:07 +01:00
Vincent Lee f52ec0a630 Modernize a spreader method 2017-08-16 16:43:01 -05:00
Vincent Lee 6c38e671d0 Split model paths for pylons 2017-08-15 20:52:23 -05:00
Vincent Lee e2c7a8ec4b Remove ancient pylon model 2017-08-15 20:32:09 -05:00
Vincent Lee 98930a924a Remove aesir ring 2017-08-15 15:18:19 -05:00
Vincent Lee 679ebb19be Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-08-15 15:10:50 -05:00
David Vierra 2fe4dad9da Fix #2322 - particle bias
Particles now wiggle along each secondary axis independently.
2017-08-07 17:29:03 -10:00
Vincent Lee f2632d1d39 Allow shaders to be reloaded using F3+T 2017-08-07 21:22:55 -05:00
Vincent Lee 1fb517ef5b Merge branch 'master' of github.com:Vazkii/Botania into 1.12 2017-08-07 21:11:40 -05:00
Vincent Lee bb55bf57c8 Add mana diamond and pearl 1/9th units, terrasteel nuggets crafted using them 2017-08-07 21:07:09 -05:00
Vincent Lee 63a7aeb8c9 Same as last commit but for 3d model 2017-08-07 20:45:04 -05:00
Vincent Lee 086e8acc2c Lexicon now uses lexicon_elven model if elven knowledge is unlocked 2017-08-07 20:13:34 -05:00
David Vierra 99f597d6a2 Fix #2326 2017-08-07 10:05:01 -10:00
Vincent Lee 6b4a2f6db3 Number tweaks 2017-08-04 23:23:40 -05:00
Vincent Lee e14c31c471 Fix #2319 2017-08-03 07:34:45 -05:00
Vincent Lee ef9efb0dfe Terrasteel now made in nugget amounts, alf portal and natura pylon made cheaper 2017-08-02 20:41:51 -05:00
Vincent Lee bf0061739b Nerf pre-elven generators by 1/3, buff rafflowsia by 2.5 2017-08-02 19:32:32 -05:00
Vincent Lee cc727c6cac Fix missed blaze mesh and a warning in clientproxy 2017-08-02 18:00:40 -05:00
Vincent Lee d897138d90 Gourmaryllis now is healthy and likes balanced diets 2017-08-02 00:01:44 -05:00
Vincent Lee 6c76aa0117 Mushrooms are now OD'ed to petals 2017-07-30 18:31:53 -05:00
Vincent Lee fcfb7d2356 Dice now succeeds until all relics are unlocked 2017-07-30 18:30:59 -05:00
Vincent Lee c8f137eccf Use a criterion trigger for relic binding instead of simple pickup, so the advancement isn't granted to people who pickup others' relics 2017-07-30 18:11:15 -05:00