Vincent Lee
622fd8a3f6
Remove old lexicon method
2020-02-14 23:59:33 -06:00
Vincent Lee
477e350757
Remove legacy meta method
2020-02-14 23:54:25 -06:00
Vincent Lee
669568f426
Move inner helper method of manaprof armor to the interface itself
2020-02-14 23:53:38 -06:00
Vincent Lee
92c6708a68
Replace sortable tool tooltypes with the ones that have been in forge for... a while
2020-02-14 23:50:45 -06:00
Vincent Lee
0a558f72bd
Some cleanups
2020-02-14 22:52:38 -06:00
Vincent Lee
85a7c986cf
Restore lexicon first person render, mostly
2020-02-14 22:48:53 -06:00
Vincent Lee
05fe2c195c
Bump patchouli and forge, fix floating flower in world render
2020-02-14 20:56:28 -06:00
Vincent Lee
9c23ff9257
Use forge's getHighlightTip for wand instead of rendering mode line ourselves
2020-02-14 20:24:02 -06:00
Vincent Lee
31de0d6dd1
Merge branch 'master' of github.com:Vazkii/Botania into 1.15
2020-01-31 13:14:42 -06:00
Vincent Lee
04ebd8c077
Github CI: Build with --no-daemon
2020-01-31 13:10:23 -06:00
Vincent Lee
ca8f61b8b1
Get rid of all 1.7-era 'parN' style parameter names
2020-01-31 13:08:16 -06:00
Vincent Lee
ef79dc7507
Remove useless passing of 1|2 to setblockstate
2020-01-31 12:59:33 -06:00
Vincent Lee
d68f34fcfe
Fix red string blocks being placed backwards
2020-01-31 12:49:55 -06:00
Vincent Lee
4ea449d723
Revert vinculotus map back into a set, hack no longer needed thanks to getEffectivePos
2020-01-31 12:48:27 -06:00
Vincent Lee
144f023041
Clean up some reflection
2020-01-31 12:30:26 -06:00
Vincent Lee
ea4ecf92af
Remove blurmipmap hack
2020-01-31 12:08:04 -06:00
Vincent Lee
9d7e8b5c2f
Update to 1.15.2
2020-01-31 12:06:11 -06:00
Hubry
4f5adbe992
Fix dispensers checking valid cocoa directions on own pos, closes #3159
2020-01-30 19:50:05 +01:00
Hubry
12e67ab394
Replace 256 wand of the forest recipe jsons with one custom recipe type
...
Prevents flooding JEI with tons of irrelevant recipes, and recipe book
buttons going offscreen if you look at all the variants of the wand.
Side effect is not showing the colored wands in JEI/Patchouli, but
that's fine.
2020-01-30 19:02:41 +01:00
Hubry
7cbe19271c
Fix terra blade bursts ignoring players you can damage
...
I had this one check wrong
2020-01-30 19:02:40 +01:00
ToMe25
ac609c9e82
Fix the "bleeding-edge lang file" link ( #3163 )
...
Fix the website lexicon page "bleeding-edge lang file" link to the github lang file, as it still linkes to a not existing en_US.lang one.
2020-01-30 10:12:08 -06:00
ToMe25
41d3c62eb9
Add a Recipe for Sweet Berries ( #3160 )
...
* Add a Recipe for Sweet Berries
* Add back the unused import
to prevent merging issues.
also how did this lang change sneak in here?
* rename translation to manaAlchemy28
as its no longer used by #3157
* Merge branch 'master' into ToMe25-patch-16
* Revert "Merge branch 'master' into ToMe25-patch-16" (#5 )
This reverts commit 5d9c68d4bbf30261ef2f0f708e0dd21b273f912b.
2020-01-30 10:11:43 -06:00
Vincent Lee
d66058f661
Merge 1.14
2020-01-29 13:36:27 -06:00
Vincent Lee
c280e31171
Delete web-legacy, again can be found in repo history if needed
2020-01-27 23:34:50 -06:00
Vincent Lee
0a24c0f8f6
Delete alt_resources as they are no longer supported in 1.14+, they can be found in older branches for older versions.
2020-01-27 23:30:26 -06:00
Vincent Lee
5ab7acd37a
Move settings that should trigger recache into build.gradle itself, enable caching
2020-01-27 23:22:46 -06:00
Vincent Lee
8f3d5fae48
Let's try this again: Revert "Disable autobuild until I figure out what's going on"
...
This reverts commit 60fac23652 .
2020-01-27 23:04:35 -06:00
Vincent Lee
0175d2c4fc
Bump patchouli dep, fix trailing comma in gog entry, and add landing text based on the website blurb
2020-01-27 23:03:52 -06:00
Vincent Lee
faeaf7285b
Return of the meme
2020-01-27 22:50:26 -06:00
ToMe25
622bbeb9fe
Allow the Terrestrial Agglomeration Plane to use Shimmerrock ( #3158 )
...
* Allow the Terrestrial Agglomeration Plane to use Shimmerrock
* how did this get here?
* why didn't this get uploaded?
* change Terrestrial Agglomeration Plane livingrock tag to terra_plate_base
* Remove unneeded item tag
2020-01-27 11:36:21 -06:00
ToMe25
ea30c6aa4a
Add a recipe for the Haert of the Sea ( #3157 )
...
* Add a recipe for the Haert of the Sea
Add the infused nautilus shell as a crafting item for the heart of the sea
* change the recipe for the Heart of the See to use
a Mana Pearl instead of one of the Manasteel ingots
* Remove the Infused Nautilus Shell and added an Alchemy Recipe for the Heart of the Sea.
* Change the mana cost for the heart of the sea to 20k
as blazepowder to mana suggested
* Make heart of the sea recipe gog only
* fix the lexicon entries getting in the wrong directory
2020-01-27 11:36:00 -06:00
Vasco Lavos
1c4f98d2bc
Update contributors.properties
2020-01-24 17:03:03 +00:00
Vincent Lee
6a46558652
Eliminate uses of java.awt.Color since using awt with lwjgl3 is apparently bad now
2020-01-23 22:32:42 -06:00
Vasco Lavos
4abd565936
Update contributors.properties
2020-01-23 18:10:26 +00:00
Vincent Lee
289dd6f9a8
Same for damage lens
2020-01-23 10:28:45 -06:00
Vincent Lee
947b591c9c
Player-fired entropic bursts now count as player kills
2020-01-23 10:14:51 -06:00
Vincent Lee
ea0201ec0e
Remove botania's lang entries for vanilla colors as vanilla has them now
2020-01-23 10:04:37 -06:00
Vincent Lee
0d094a8bf6
Delay burst instantiation until we're sure we have enough mana. Closes #3133
2020-01-22 19:14:33 -06:00
Vincent Lee
830b87db40
Save and restore full state when mossifying an altar, fixes #3154
2020-01-22 19:11:50 -06:00
Vincent Lee
3b250ae1c2
Make desu gun use handheld model, fixes #3153
2020-01-22 19:09:23 -06:00
Vincent Lee
f0718de536
Make dedicated mana blaster advancement trigger and desu option. Consistentifies desu gun advancement criteria with the desu gun appearance. Closes #3156
2020-01-22 18:57:54 -06:00
Vincent Lee
a12056fbf4
Remove custom getLightValue from subtiles, should be implemented on a per-block basis now the usual vanilla way. May resolve lighting issues? ( #3140 )
2020-01-22 18:18:31 -06:00
Vincent Lee
42ee5d0d8d
Merge 1.14
2020-01-22 17:05:28 -06:00
Vincent Lee
af0217153d
Fix cell blocks not respecting getEffectivePos
2020-01-22 10:12:49 -06:00
Vasco Lavos
07916b13ed
Update contributors.properties
2020-01-22 15:41:34 +00:00
Vincent Lee
a6ad70f0bc
Fix red string renderer freaking because alpha is less than 0
2020-01-21 21:48:14 -06:00
Vincent Lee
1954b69e16
Fix tiny potato aux renders
2020-01-21 21:38:48 -06:00
Vincent Lee
549adb3d42
Fix gold renders
2020-01-21 11:45:25 -06:00
Vincent Lee
de450cb633
Fix astrolabe shader usage and preview being offset in Z direction
2020-01-21 10:42:15 -06:00
Vincent Lee
e78a1f21f3
update accessoryhelper to use matrixstack
2020-01-21 10:21:43 -06:00