Commit Graph
6588 Commits
Author SHA1 Message Date
Hubry 99df65bb45 Change the seed source for plentiful mantle rod, fixes #3178 2020-02-17 19:10:31 +01:00
Hubry 0e73ef6f08 Minor patchouli corrections, remove old TC recipes/integration pages 2020-02-17 18:40:25 +01:00
Hubry 6fe73cb39f Generate recipe and advancement jsons, remove old recipes
Closes #3171
2020-02-17 18:38:22 +01:00
Hubry 9cc6eb9870 Create recipe generator for existing json recipes 2020-02-17 18:34:20 +01:00
Vincent Lee 59e0c6c987 Narrator: it wasn't released 2020-02-16 21:21:36 -06:00
Vincent Lee 9253a541c4 Replace bauble box slots with a player render because what else would i put there 2020-02-16 21:20:23 -06:00
Vasco Lavos eabdbd910a Update contributors.properties 2020-02-16 14:16:03 +00:00
Vincent Lee 3ccbef5c16 Loki ring now highlights center pos in bold even when not building a new list of cursors 2020-02-15 19:58:32 -06:00
Vincent Lee 162519dba3 Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179 2020-02-15 19:58:32 -06:00
Vincent Lee 13668c5448 Modernize ToolCommon.raytraceFromEntity 2020-02-15 19:58:31 -06:00
Vasco Lavos 954020392f Update contributors.properties 2020-02-14 17:00:09 +00:00
Vasco Lavos b373df600c Update contributors.properties 2020-02-13 22:56:55 +00:00
Vasco Lavos 674c454030 Update contributors.properties 2020-02-11 17:29:09 +00:00
Vincent Lee 065d189c5e Mark cocoon-spawned entities as un-despawnable 2020-02-10 13:17:05 -06:00
Vincent Lee bb68017141 Fix missing nullcheck in platform. Closes #3168 2020-02-07 21:10:43 -06:00
Vincent Lee 647e122418 Fix unnecessary cast in CompositeLensRecipe 2020-02-07 13:55:04 -06:00
Vincent Lee d46c35df14 Clean up agricarnation code a bit, fix it not speeding up berries and bamboo 2020-02-07 10:56:26 -06:00
Vasco Lavos fbddf4862b Update contributors.properties 2020-02-07 10:12:39 +00:00
Vasco Lavos ef4ede8906 Update contributors.properties 2020-02-06 21:30:27 +00:00
Hubry 7a05395ba3 Add a decay indicator on stacks of hydroangeas 2020-02-06 19:00:53 +01:00
Hubry bbb472c3a8 Fix exoflames trying to smelt unsmeltables after a smeltable was put in 2020-02-06 18:51:32 +01:00
Hubry e96550208b Fix spawner spawned slimes working for narslimmus 2020-02-06 01:25:47 +01:00
Vasco Lavos e2f0220dd4 Update contributors.properties 2020-02-05 09:50:01 +00:00
Vincent Lee 4185fac8d6 Build 2020-02-04 17:42:25 -06:00
Hubry d49fba9abc Fix redirect lens pointing at 0,0,0, closes #3167 2020-02-05 00:38:24 +01:00
Vincent Lee 607c581970 Bump Patchouli 2020-02-04 17:32:19 -06:00
Vincent Lee 9006e7c795 Fix #3161 flight bar drained by creative/spectator 2020-02-04 16:59:04 -06:00
Hubry 10ac3c3067 Fix empty prisms allowing warped bursts to transfer mana 2020-02-02 22:51:29 +01:00
Vincent Lee 04ebd8c077 Github CI: Build with --no-daemon 2020-01-31 13:10:23 -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 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
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