Vincent Lee
|
8d759ff126
|
Merge branch '1.14' of github.com:Vazkii/Botania into 1.14
|
2019-10-09 21:07:06 -05:00 |
|
Vincent Lee
|
589fe30964
|
Hoist some particle data decls, eliminates some allocations
|
2019-10-09 21:06:11 -05:00 |
|
Vincent Lee
|
a71d31d7fc
|
Merge pull request #2986 from Hubry/tags
Some minor tag handling cleanup
|
2019-10-08 16:04:20 -05:00 |
|
Vincent Lee
|
4b77da29be
|
Merge pull request #2985 from Hubry/curio-reorg
Reorganize curios back to what they were in 1.12
|
2019-10-08 16:03:24 -05:00 |
|
Vincent Lee
|
6c1a9af6ca
|
Render both upgrade and star :smart:
|
2019-10-08 15:30:09 -05:00 |
|
Hubry
|
4f97c8e861
|
Centralize tag handling
|
2019-10-08 18:52:21 +02:00 |
|
Hubry
|
490dd4525f
|
Reorganize curios back to what they were in 1.12
Curios 1.0.2 added a "curio" tag which is basically
the Baubles "trinket" type (can go into any slot)
|
2019-10-08 18:11:02 +02:00 |
|
Vincent Lee
|
d798e44e8c
|
Allow sparks to have different color networks like corporea. For now, show by coloring the upgrade icon, and displaying the corporea star if there is no upgrade
|
2019-10-07 19:40:34 -05:00 |
|
Vincent Lee
|
be6d7f610e
|
Make an advancement of elven knowledge. Code side is super messy mix of old and new systems right now, but we can clean it up later.
|
2019-10-05 14:00:33 -05:00 |
|
Vincent Lee
|
f1d38877d9
|
Point to existing lexicon item (needed for our yellow border highlight + lexicon model stuff). Also fix tall grass conjuration not conjuring anything.
|
2019-10-05 13:23:45 -05:00 |
|
Vincent Lee
|
df8fc76c48
|
Fix #2975, fix #2976
|
2019-10-05 12:40:19 -05:00 |
|
Vincent Lee
|
74055595ba
|
Mark patchouli as a dep
|
2019-10-05 12:05:22 -05:00 |
|
Vincent Lee
|
4a9bf8b675
|
Merge pull request #2981 from Hubry/more-patchouli
Tweak templates, remove workarounds, mark some entries as default read
|
2019-10-04 16:54:52 -05:00 |
|
Hubry
|
fc65cbd1f5
|
Tweak templates, remove workarounds, mark some entries as default read
|
2019-10-03 20:20:49 +02:00 |
|
Vincent Lee
|
90977798d4
|
Partially restore corporea crystal cube model
|
2019-09-27 22:37:45 -05:00 |
|
Vincent Lee
|
bf79be5210
|
'Fix' shader loading
|
2019-09-27 12:02:09 -05:00 |
|
Vincent Lee
|
43c5fadce5
|
Misc todo fixes and cleanups
|
2019-09-27 11:27:22 -05:00 |
|
Vincent Lee
|
8553a4d5df
|
Fix placing platforms against platforms not playing the place sound
|
2019-09-27 10:49:33 -05:00 |
|
Vincent Lee
|
a3b7f1c4b0
|
Combine camo and platform classes, they didn't ever need to be separate
|
2019-09-27 10:43:54 -05:00 |
|
Vincent Lee
|
172119701c
|
Merge branch '1.14' into patchouli
|
2019-09-24 16:52:33 -05:00 |
|
Vincent Lee
|
ffc8deaaed
|
Merge pull request #2977 from Hubry/patchouli
Port lexicon pages to Patchouli, improve generator code
|
2019-09-24 16:41:54 -05:00 |
|
Hubry
|
ab412507c7
|
Port lexicon pages to Patchouli, improve generator code
|
2019-09-24 23:16:29 +02:00 |
|
Vincent Lee
|
2f5d163427
|
Fix use of client only method
|
2019-09-14 20:07:26 -05:00 |
|
Vincent Lee
|
b4e0a076e7
|
Finish migrate to vanilla particle sys
|
2019-09-14 19:50:52 -05:00 |
|
Vincent Lee
|
f0993c20a4
|
Prep for moving to vanilla particle system
|
2019-09-14 18:16:13 -05:00 |
|
Vincent Lee
|
4cd4b220d3
|
Fix curios version string, fix armors not using mana for durability, fix fluid display in pure daisy JEI
|
2019-09-14 12:36:04 -05:00 |
|
Vincent Lee
|
3bc86fbc54
|
prep cf changes
|
2019-09-14 11:59:37 -05:00 |
|
Vincent Lee
|
b0ec69f1f0
|
Require curios
|
2019-09-14 11:58:33 -05:00 |
|
Vincent Lee
|
a3b6a2ca6b
|
Fix missing mossy dremawood planks model, semi-fix ghost rails
|
2019-09-14 11:47:17 -05:00 |
|
Vincent Lee
|
35df76b230
|
remove wrapping log
|
2019-09-13 23:22:22 -05:00 |
|
Vincent Lee
|
cdf4a26a94
|
Fix swapped color in lens dying
|
2019-09-13 23:22:04 -05:00 |
|
Vincent Lee
|
a56dd81eed
|
Fix spawn packet for bursts
|
2019-09-13 22:00:39 -05:00 |
|
Vincent Lee
|
107097af0d
|
Fix some dumb bugs and crashes
|
2019-09-13 21:55:33 -05:00 |
|
Vincent Lee
|
7d318bb3bf
|
Merge 1.12
|
2019-09-13 18:12:46 -05:00 |
|
Vincent Lee
|
3c2de8453e
|
bump forge to rb, fix fluid stuff
|
2019-09-13 17:48:37 -05:00 |
|
Vincent Lee
|
7aca7bbac1
|
build
|
2019-09-09 22:22:13 -05:00 |
|
Vasco Lavos
|
f03b91c67d
|
Update contributors.properties
|
2019-09-10 00:22:24 +01:00 |
|
Vincent Lee
|
6ba1436ac0
|
Fix improper dumping of registry names in brew entries
|
2019-09-09 00:11:26 -05:00 |
|
Vincent Lee
|
e9aa92efec
|
Finish multiblocks
|
2019-09-09 00:04:38 -05:00 |
|
Vasco Lavos
|
29d158617e
|
Update contributors.properties
|
2019-09-08 02:09:38 +01:00 |
|
Vasco Lavos
|
bbeba2b52f
|
Update contributors.properties
|
2019-09-01 19:12:29 +01:00 |
|
Vasco Lavos
|
4847cb8f2e
|
Update contributors.properties
|
2019-08-30 17:52:14 +01:00 |
|
Vasco Lavos
|
cf4fa0d6cd
|
Update contributors.properties
|
2019-08-30 01:22:19 +01:00 |
|
Vincent Lee
|
dad9192a8d
|
Couple of multiblocks
|
2019-08-27 19:12:49 -05:00 |
|
Vincent Lee
|
f2616f99c6
|
Add in dummy templates so the game doesnt crash
|
2019-08-27 18:09:11 -05:00 |
|
Vincent Lee
|
d1636c79fb
|
use patchouli native crafting page for single recipe pages
|
2019-08-27 17:36:20 -05:00 |
|
Vincent Lee
|
6966e620c4
|
Rename files to snake case, fix special flower category names
|
2019-08-27 17:08:49 -05:00 |
|
Vincent Lee
|
0e187f0756
|
dumper code + temporary dumped results
|
2019-08-27 16:39:31 -05:00 |
|
Vincent Lee
|
218fb4c2c7
|
experimenting with patchouli
|
2019-08-26 16:01:02 -05:00 |
|
Vincent Lee
|
cb31f06b69
|
Clean up gun model a bit
|
2019-08-24 12:27:57 -05:00 |
|