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
Vincent Lee
0f03c04c33
Merge pull request #2339 from gerhard2202/catalyst-fix
...
Fixes the alchemy catalyst eating everything and never working
2017-08-28 23:10:20 -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
f3dcb4f68f
Bump major version
2017-08-20 12:23:53 -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
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