Commit Graph
6620 Commits
Author SHA1 Message Date
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
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
Vincent Lee edf40208bf Some spring cleaning 2020-01-19 18:10:48 -06:00
Vincent Lee d00f0e14e8 build 2020-01-19 18:01:23 -06:00
Vincent Lee b7e8c665b6 Fix a bunch of legacy format codes in non english lexicon entries 2020-01-19 17:56:23 -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 60fac23652 Disable autobuild until I figure out what's going on 2020-01-19 16:57:39 -06:00
Vincent Lee b94a6a6101 Extra ore weight patch 2020-01-19 16:42:10 -06:00
Vincent Lee da99dc8247 Add build action for pushes and PR's 2020-01-19 16:37:24 -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