Commit Graph
5445 Commits
Author SHA1 Message Date
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 4a0416a557 Fix lexicon entry on terrasteel page 2017-08-15 15:39:30 -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
Vincent Lee e21ccbc7bd Merge pull request #2329 from codewarrior0/issue-2322-particle-bias
Fix #2322 - particle bias
2017-08-07 22:41:39 -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 42d9e18b56 Update lexicon entry 2017-08-07 21:09:52 -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
Vincent Lee f569048f40 Merge pull request #2328 from codewarrior0/issue-2326-side-event
Fix #2326
2017-08-07 17:44:24 -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 4015913e58 Rename blaze lamp and mana distributor 2017-08-02 00:11:59 -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
Vincent Lee 2dc50866a1 Remove deprecated relic binding by name in favor of uuid 2017-07-30 17:39:33 -05:00
Vincent Lee a2a0ba4275 Rafflowsia can now eat anything except itself 2017-07-30 17:18:49 -05:00
Vincent Lee 966406d195 Fix relic lexicon entries and add relic advancements 2017-07-30 14:24:50 -05:00
Vincent Lee 3790652d3d Some missing challenge advancements 2017-07-30 13:33:05 -05:00
Vasco Lavos 1102792bf9 Change GUI buttons for the lexica. 2017-07-30 18:06:23 +01:00
Vincent Lee 8f12fbde20 Fix a todo 2017-07-23 16:38:58 -05:00
Vincent Lee 6fc22e19da Fix flugel eye use animation and particles, and make binding interaction less intrusive 2017-07-22 21:42:49 -05:00
Vincent Lee 03ece97fdf Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-07-22 17:28:24 -05:00
Vincent Lee 2b2f48f085 Remove pickDefaultState hack from 1.9 since it's unneeded now 2017-07-22 17:14:46 -05:00
Vincent Lee 35d440ad37 Add note for pagecraftingrecipe 2017-07-20 23:45:23 -05:00
Vincent Lee 9d78aca015 Clean up some todos 2017-07-20 23:42:45 -05:00
Vincent Lee a990e6a8d5 Diff spam warning: Bump forge, move wand recipes to json. Are we done? 2017-07-20 23:34:11 -05:00
Vincent Lee c3ff13bce0 More. recipes. 2017-07-20 20:53:00 -05:00
Vasco Lavos 9c2eae6a33 Update contributors.properties 2017-07-20 17:55:01 +01:00
Vincent Lee 73b440732a Remove debug log from prev commit 2017-07-16 18:42:19 -05:00
Vincent Lee 9f0068538e Fix #2309 and also fix the particles not accounting for position shift 2017-07-16 18:41:25 -05:00
Vincent Lee 1d810fba7a More recipes. 2017-07-16 15:53:44 -05:00
Vincent Lee 63b9fa19d1 Moar recipes, fix wand recipes 2017-07-15 21:20:56 -05:00
Vincent Lee 0d25e3913b Bump forge 2017-07-15 14:08:08 -05:00
Vasco Lavos 924ee0267b buildy 2017-07-15 15:01:38 +01:00
Vincent Lee adfc6e41d9 Check spark liveness before interacting. Closes #2302 2017-07-13 20:21:11 -05:00