Commit Graph
5510 Commits
Author SHA1 Message Date
Mark Glines d3f25a59cd Fix Mana Fluxfield max energy value. 2017-09-24 06:19:43 -04:00
Vasco Lavos 4fda4a9d6c Update contributors.properties 2017-09-23 21:53:36 +01:00
wiiv 8bf5e00b4a Removed references to the Ring of Aesir. Fix #2374 2017-09-21 15:24:32 +01:00
wiiv 2257d841b9 Added 4 new Azulejo Patterns. Fix #2376 2017-09-21 14:48:19 +01:00
Vincent Lee 05d9709a06 Merge pull request #2371 from codycoolwaffle/patch-2
Infinite Hopperhock usage fix
2017-09-20 17:07:45 -05:00
Vincent Lee d16345db41 Why do sideonly methods exist? Fix #2389 2017-09-20 17:06:03 -05:00
Vincent Lee 0e2a84daa1 Fix #2369 2017-09-20 11:59:28 -05:00
Vincent Lee 6327203634 Missed a few from last commit 2017-09-20 08:08:45 -05:00
Vincent Lee 8f09bc403d Fix #2365 2017-09-20 08:06:06 -05:00
Vincent Lee fc37455de6 Fix #2367 2017-09-20 07:51:21 -05:00
Vincent Lee e72ceb82c1 Fix #2366 2017-09-18 07:57:11 -05:00
wiiv a18d45a62f More updated assets. 2017-09-11 21:34:20 +01:00
codycoolwaffle 1d778537de Infinite Hopperhock usage fix
Closes #2370
2017-09-08 23:32:42 -07:00
Vincent Lee 5a5d49d98b Fix #2361, and probably fixes #2346, caused indirectly by ModCoderPack/MCPBot-Issues#302. 2017-09-06 14:57:39 -05:00
Vasco Lavos 61078fd17e Update contributors.properties 2017-09-06 02:21:52 +01:00
Vincent Lee eab67fea13 big derp. Fixes #2357 2017-09-04 23:27:07 -05:00
Vasco Lavos f327fb5125 Build 347 2017-09-04 22:01:17 +01:00
Vasco Lavos ab126ac9db Fixed crashes when viewing the Dandelifeon and Elven Mana Lenses pages. Closes #2355 2017-09-04 21:41:37 +01:00
wiiv 71a1d47291 Fixed and updated some more assets. 2017-09-04 21:29:00 +01:00
Vasco Lavos 8107ec8b03 Update contributors.properties 2017-09-03 16:01:19 +01:00
Vasco Lavos 435d59798c Build 346 for 1.12.1 2017-09-02 19:18:38 +01:00
Vasco Lavos 97cc9fe5f6 Build files 2017-09-02 19:02:41 +01:00
Vasco Lavos 25d443f3e2 Compress textures 2017-09-02 18:54:11 +01:00
Vasco Lavos b71198b31e Document the Gourmaryllis and buff it a little bit. 2017-09-02 18:51:45 +01:00
Vasco Lavos fe7fad813a Bump API version 2017-09-02 18:38:56 +01:00
Vasco Lavos b89620c267 Fixed the pylon render for multiblock displays 2017-09-02 18:26:44 +01:00
Vasco Lavos 07d7166b43 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-09-02 18:26:22 +01:00
Vasco Lavos cb1b194e3f Albedo support 2017-09-02 18:26:16 +01:00
Vincent Lee 0df3240481 Get rid of a model error 2017-09-02 11:20:10 -05:00
Vincent Lee 0efc8e9fdb Get rid of spreader item model warnings 2017-09-02 11:16:22 -05:00
Vincent Lee 927db3c088 Readd missing waterbowl textures 2017-09-02 11:03:55 -05:00
Vasco Lavos 678fd193da Pylon rendering 2017-09-02 17:02:33 +01:00
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 2bfcbb3bc5 Revert "Update lexicon entry"
This reverts commit 42d9e18b56.
2017-09-02 16:26:44 +01:00
Vasco Lavos 259bd4ff37 Revert "Fix lexicon entry on terrasteel page"
This reverts commit 4a0416a557.
2017-09-02 16:26:06 +01:00
Vincent Lee fcb2375fe5 Fix some missing textures 2017-09-02 10:17:11 -05:00
Vasco Lavos 93a845a1b8 Fixed some warnings 2017-09-02 16:13:42 +01:00
Vasco Lavos 938aab69e5 Merge pull request #2347 from Vazkii/1.12
1.12
2017-09-02 15:10:32 +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
Vasco Lavos 3b06d5f1dd Update contributors.properties 2017-09-02 02:26:29 +01: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