Commit Graph
5684 Commits
Author SHA1 Message Date
Vincent Lee 280ffe2f58 gg uses iextraspawndata instead of datawatcher for some fields 2018-08-22 12:15:13 -05:00
Vincent Lee de905a4bd1 Merge pull request #2708 from matthijsvdmeulen/master
Removed Railcraft support for the Mana Pool with Minecart.
2018-08-21 12:46:05 -05:00
Vincent Lee ae572867af Merge pull request #2707 from Hubry/oredict
Use ore dictionary ingredients in more recipes
2018-08-21 12:45:05 -05:00
Matthijs van der Meulen 49638c0aa6 Removed Railcraft support for the Mana Pool with Minecart.
As the Railcraft API for 1.12.2 is highly unstable, and crashes with the current version of Botania installed, I removed the implementation of IMinecartItem and all corresponding methods. The Mana Pool with Minecart still functions fine with railcraft, but now it doesn't crash anymore
2018-08-21 19:27:28 +02:00
Hubry f6c5b10962 Use ore dictionary ingredients in more recipes 2018-08-21 19:09:49 +02:00
Hubry 8e2b09527a Update TC integration to beta 21, small tweaks to aspects (#2693)
* Formatting fixes for my previous PRs

* Bump Forge, JEI and Thaumcraft and specify some of them in mod deps

Forge to latest recommended (TC requires it)
Thaumcraft to Beta 21 (the new aspect registration)
JEI to stable 4.10.0.198 (mostly for testing purposes like Thaumic JEI)

* Move to the aspect event and tweak some item aspects
2018-08-18 14:03:25 -05:00
Vasco Lavos 3c6794e722 Update contributors.properties 2018-08-12 02:32:39 +01:00
Vasco Lavos 15f71c8a53 Merge pull request #2678 from quat1024/reallyMakesUThink
Add "Thinking Hand" cosmetic bauble
2018-07-20 04:36:41 +01:00
quat 5e7c963017 (unrelated) Fix Googly Eyes rendering inside the player's head 2018-07-19 23:11:51 -04:00
quat b9d2d78a80 Add lexicon page for the thinking hand 2018-07-19 23:07:41 -04:00
quat 1afb719782 add Thinking Hand cosmetic bauble 🤔 2018-07-19 22:54:03 -04:00
Hubry 73a1055b65 Reintroduce corporea index requesting from inventory/JEI item panel. (#2668)
* Reintroduce corporea index requesting from item panel.

This was removed in 08550cc442, during
the move from NEI to JEI. Rewritten to use JEI instead of NEI.

* Make this feature not depend on JEI to function, redo key checking

Instead, the JEI plugin will set a dummy supplier in the corporea handler to a proper one pulling from the item panel.
In addition, keyboard checks now use Keyboard's triggers instead.
2018-07-13 08:25:34 -07:00
Hubry 58346ad107 Update Thaumcraft integration (#2667)
* Pull TC6 from Curseforge's maven thing, remove API classes from repo

* Update Thaumcraft integration

* Make upgrade recipes move attached Thaumcraft item data properly
* Fix full mana inkwells pulled from creative menu not working
* Blacklist flux rifts instead of (removed) aura nodes from gravity rod
* Clean up a few TODOs around Thaumcraft integration
* Finally, assign Thaumcraft aspects to Botania items

* Add config for aspects.

Just in case of some bugs in Thaumcraft, or for modpack makers who want
to customize, so they don't have to disable everything by hand.
2018-07-12 22:58:16 -07:00
Hubry 5841466efa Clean up and update wiki providers. (#2666)
Lowercase modids, remove providers for defunct sites and mods with
no chance to come back, use HTTPS for Gamepedia, update URLS to sites
that moved.
2018-07-03 20:17:03 -07:00
Vincent Lee 7347d6df5c Fix #2662 2018-06-29 20:50:17 -07:00
ALongStringOfNumbers 483a816616 Elementium Tools now repair with Elementium (#2656)
* Elementium Tools now repair with Elementium

* Add proper parameter names

* Revert changes to armor, as I did not change it in the first place
2018-06-21 18:50:13 -07:00
Jared ba245a1499 Maven and jenkins stuff (#2623)
* Add the jenkins build number

* Create Jenkinsfile

* no crashes when no private.properties

* Changed to setupCIWorkspace
2018-06-18 19:27:57 -07:00
TheIllusiveC4 5a148b01f3 Fixed usages of deprecated getFullDiscountForTools method (#2622) 2018-06-18 19:27:33 -07:00
David Vierra c9f8347299 Add JEI handlers for Orechid and Orechid Ignem (#2632)
* Add JEI handlers for Orechid and Orechid Ignem

* Make whitespace consistent

* Change lazy-initialized item stacks to init in constructor

* Change `doesOreExist` to take a String instead of an Entry

* Remove `oreDictKey` field since it is only ever used in the constructor

* Add `final` and change access qualifiers where appropriate

* Remove pointless accessor
2018-06-18 19:26:26 -07:00
Rafal Kolanski ba29aff21e In skyblock, use horizon height and void fade as in Void biome. (#2634) 2018-06-18 19:25:10 -07:00
Vincent Lee 0a400e2384 Fix #2641 2018-06-02 10:46:41 -07:00
Vincent Lee 5cfc6349c8 One broken boi. Closes #2630 2018-05-17 20:55:04 -05:00
Vincent Lee 4fda575d4d Fix typo, make some tenses consistent 2018-05-15 23:29:19 -05:00
Vincent Lee a172698dc9 Fix vertical spark range being inconsistent between up and down dirs. Closes #2627 2018-05-13 21:18:55 -05:00
Vincent Lee 767ecf78c2 Narrow bounds of some getEntitiesWithinAAB calls, should yield a very minor performance boost 2018-04-30 02:03:24 -05:00
Vincent Lee 24c542f31f Fix #2618 2018-04-30 01:47:53 -05:00
Vasco Lavos 79f9ea048d builderino 2018-04-24 17:10:01 +01:00
Vincent Lee e6e756815d Delete IRunicArmor interface as it no longer exists. Should now run with TC6 beta. Closes #2608, closes #2612 2018-04-24 10:24:48 -05:00
Vincent Lee ed72ff3d5f No longer crashes when loaded with TC6 beta. Note that this is just a crash-prevention fix, the actual integration still needs modernizing 2018-04-24 01:25:43 -05:00
Vasco Lavos 123e35d444 Update contributors.properties 2018-04-23 19:01:30 +01:00
Vincent Lee c3adac1c04 Mana blaster bursts now spawn off the correct hand, closes #2609 (also fixes color handler making a new entity every render tick) 2018-04-22 15:38:43 -05:00
Vincent Lee 7d48d1ffb9 Fix some flower sparkle particles not accounting for vanilla flower random shifts 2018-04-18 18:35:31 -05:00
Vincent Lee 4123a8beb3 Fix munchdews going on long cooldowns too often. Closes #2449 2018-04-18 18:24:35 -05:00
Vincent Lee 7fe66d4868 Blacklist bursts from interdiction torch properly 2018-04-17 11:25:48 -05:00
Vincent Lee 4577e17553 Bandaid for apothecary crashes. Closes #2471, closes #2555 2018-04-17 10:04:44 -05:00
QuarterAnimal 4383e8cbbc Support rotation of structures containing mana spreaders (#2599) 2018-04-11 22:09:37 -05:00
Vincent Lee 34afbd45ab Fix #2590 baubles disappearing 2018-04-09 10:28:47 -05:00
Vincent Lee e3e4522339 Fix functional flower advancement having a broken icon 2018-04-08 14:32:50 -05:00
Vincent Lee 28e8a3df94 Fix accidental api dependency on botania-proper. Closes #2597 2018-04-08 14:29:55 -05:00
Vincent Lee 920f9e2676 Extrapolated bucket now picks up mod fluids. Closes #2585 2018-03-25 10:18:25 -05:00
Vincent Lee f477d4eb29 Fix thermalilies not penalizing for giving it lava while on cooldown
No idea how that return snuck back in there, it got explicitly removed
in the past. Looks like 5211ed9 introduced it.
Enjoy your unnerfed thermalilies for the last 2 years while you can!
2018-03-24 02:00:59 -05:00
Vincent Lee 34280c942b Fix particles 'snapping into place', a vanilla bug. Closes #2217 2018-03-19 22:26:31 -05:00
Vincent Lee 4f4971ca73 Gaia guardian minor fixes: make anti-flight smarter, and search for initial player aggro further in the entire arena. Closes #2304 2018-03-16 17:50:38 -05:00
Vincent Lee 51e8c30c7b Add config to disable botania's f3 debug info. Closes #2232 2018-03-15 18:07:39 -05:00
Vincent Lee 4e8b4a6422 Clean up special flower model code. No longer loads all flower models twice 2018-03-15 16:45:42 -05:00
Vasco Lavos 16afd62152 Update contributors.properties 2018-03-15 20:08:03 +00:00
Vincent Lee 6cc3af360b Fix tiny potato banners being unobtainable, closes #2537.
Registration was done in preinit before the itemblock was registered
2018-03-14 20:50:39 -05:00
Vincent Lee 54f901dce9 Featherfeet no longer increases fall distance, fixes #2516 2018-03-14 20:37:48 -05:00
Vincent Lee bb087f3d82 Fix missing sideonlies, closes #2572 2018-03-14 20:16:40 -05:00
Vincent Lee d502c90b91 Fix sparks not transferring mana properly to mana-voided pools. Closes #2557 2018-03-14 20:12:10 -05:00