Commit Graph
3531 Commits
Author SHA1 Message Date
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 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
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
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 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
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
Vincent Lee edf40208bf Some spring cleaning 2020-01-19 18:10:48 -06:00
Al Winfy 0fd1b5fb9c Remove Tiara's dependence on fallDistance (#3143)
Effectively allows it to work with skyrod
2020-01-19 17:16:20 -06:00
ToMe25 463eafb860 Make Ring of Dexterous Motion able to be used in.. (#3104)
..all four directions and while moving
2020-01-19 17:11:36 -06:00
Vincent Lee b94a6a6101 Extra ore weight patch 2020-01-19 16:42:10 -06:00
ToMe25 ddcb1036b3 Add some Orechid compatibility back (#3113)
* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Delete IMCSender.java

Another upload that didn't understand it should go in the opened directory, maybe i should stop using the web interface...

* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Remove all the ores that aren't even 1.12.2

* Update some ore weights

* Update some more Ore Weights

* Fix some small things
2020-01-19 16:32:22 -06:00
Vincent Lee bbc3892761 Orechid now filters out empty tags before trying to pick one. Fixes situations where many registered tags being empty would 'starve' out the nonempty ones 2020-01-19 16:30:44 -06:00
Vincent Lee 0e73e16e10 Fix vine and mushroom rendering 2020-01-19 16:21:42 -06:00
Vincent Lee 2577de5b60 Fix sparks not rendering and solid vines not being flammable (patches from MoriyaShiine) 2020-01-19 16:04:51 -06:00
Vincent Lee 0836cee840 Fix enchanter and terra plate renders 2020-01-19 12:06:56 -06:00
Hubry b9c1ae85bf Fix shaded mesa not launching entities, closes #3106
Also stops the expiry countdown from incrementing past -1
2020-01-19 19:02:11 +01:00
Hubry f7da8b4109 Don't draw tiara/dodge hud if hud is hidden by creative
Didn't check creative when changing this earlier
2020-01-19 18:09:34 +01:00
Hubry 09f4864738 Replace the duplicated livingrock recipe with the somehow removed cobble 2020-01-19 17:34:31 +01:00
Hubry 81391688ae Move tiara/dodge renders, use forge's gui offsetting for flight bar
Fixes #3118
2020-01-19 17:33:04 +01:00
Hubry 8fa3d9c790 Fix config typo that went unnoticed for over 5 years :wacko: 2020-01-19 00:40:20 +01:00
Hubry d5b91eefb4 Attempt at fixing #3108
Stopping sprint doesn't do much if you are holding ctrl anyways
Closes #3108
2020-01-19 00:39:22 +01:00
Hubry 3090006d5e Move fish to spawn if the cocoon is next to water, add other water mobs 2020-01-18 23:32:59 +01:00
Vincent Lee 4691f7d4a1 Fix mana blaster lens render 2020-01-18 16:09:19 -06:00
Vincent Lee 8e9f5a1473 Fix some of tiny potato renders 2020-01-18 15:28:01 -06:00
Vincent Lee 8d0c8e13c4 Also delete ItemBlockMod 2020-01-18 15:11:29 -06:00
Hubry 0840478c2a Replace PvP-enabled check with "can player damage other player" check
Fixes #3146
2020-01-18 22:08:51 +01:00
Vincent Lee 09352e7285 Snipe some todos, delete ItemMod class 2020-01-18 14:56:20 -06:00
Hubry 11ea2ed845 Simple fix for invisible chakrams, fixes #3149 2020-01-18 18:47:04 +01:00
Vincent Lee a6dd4d74fa Fix floating flower transforms 2020-01-17 22:52:29 -06:00
Vincent Lee c509874908 Datagenerate floating flower blockstates and models 2020-01-17 22:30:24 -06:00
Vincent Lee 784844914a Datagenerate red string blockstates 2020-01-17 21:34:24 -06:00
Vincent Lee d75df9fa6a Datagenerate incense plate, pump, fel pumpkin, tiny potato 2020-01-17 21:24:00 -06:00
Vincent Lee f58a48c254 Datagenerate special, mystical, glimmering, tall flower and mushroom blockstates 2020-01-17 19:49:36 -06:00
Vincent Lee 505e9fa1bf Apothecaries data generated 2020-01-17 19:22:22 -06:00
Vincent Lee e5bd8548f4 Panes and walls, move stairs out of their folder 2020-01-17 19:20:48 -06:00
Vincent Lee 73685b3e8e Generate fences and fence gates blockstates 2020-01-17 18:17:02 -06:00