Commit Graph
5788 Commits
Author SHA1 Message Date
Vincent Lee fb8ebd8ca7 Update forge/mappings/thaumcraft 2018-12-25 22:02:04 -06:00
Vincent Lee 5393a5202a Fix sparks/corporea sparks blocking arrows and digging 2018-12-20 15:29:08 -06:00
Vasco Lavos 11ea3f9ee6 Update contributors.properties 2018-12-17 22:35:11 +00:00
Vasco Lavos cff18771a5 Update contributors.properties 2018-12-14 20:25:09 +00:00
Vincent Lee 136696d9d7 Fix #2803 2018-12-13 17:43:53 -06:00
Vasco Lavos 642e5fecf2 Update contributors.properties 2018-12-11 16:58:33 +00:00
Vasco Lavos e26e11fabb Update contributors.properties 2018-12-08 23:43:38 +00:00
Vasco Lavos b6d9e40f90 Update contributors.properties 2018-12-03 20:02:56 +00:00
Vincent Lee c80a3400e6 Merge pull request #2798 from Hubry/redirect-phantom
Fix redirection lenses having phantom lens functionality as well
2018-12-03 01:44:52 -06:00
Hubry 2226055872 Fix redirection lenses having phantom lens functionality as well 2018-12-02 21:21:08 +01:00
Vincent Lee 4e4d6dffb9 Merge pull request #2796 from quat1024/apothecary_oops
Fix #2795 by tagging spawned apothecary item entities
2018-12-02 11:20:24 -06:00
quat 62a87277d4 Fix #2795 by tagging spawned apothecary item entities 2018-12-02 04:56:56 -05:00
Vasco Lavos 8d38659cbc Update contributors.properties 2018-12-02 03:16:55 +00:00
Vasco Lavos da1e25ed60 Update contributors.properties 2018-11-30 12:07:42 +00:00
Vasco Lavos 3ed41129a7 build 2018-11-30 05:14:49 +00:00
Vasco Lavos 9c6a5181ad Update package-info.java 2018-11-30 05:08:04 +00:00
quaternary 6a1ee4afca Tentative mana spreader path tracing optimizations (#2788)
* Tentative mana burst optimizations

* Add configuration option for spreader trace time

* One more easy optimization

* oops lang
2018-11-30 04:54:29 +00:00
Vasco Lavos 74d569615d Update contributors.properties 2018-11-30 04:44:59 +00:00
Vasco Lavos 8f6f7b5438 Fixed #2792 2018-11-30 04:37:21 +00:00
Hubry d0575240e6 Add offline mode config option and localize all config options (#2780) 2018-11-30 04:35:05 +00:00
iPopstop 6fb62b8d85 Update ru_ru.lang (#2783)
* Update ru_ru.lang

Minor grammar fixes

* Update ru_ru.lang

A lot of changes to make the translation more correct.
___
P.S. It's not over yet :d

* Minor fixes
2018-11-30 04:34:53 +00:00
quaternary 531912e726 Some botania tweaks stuff (on discord) (#2791)
* Taste the rainbow

* Gunpowder to flint = flint to gunpowder

* Allow whatever in the Petal Apothecary, remove canFit in IFlowerComponent

* NBT aware apothecary altar stuff
2018-11-30 04:33:43 +00:00
Vincent Lee 8f716c98f0 Consistentify whether GoG behaviours are enabled by a skyblock world or the GoG jar (all gameplay now only checks for the presence of the jar). Closes #2754 2018-11-28 23:57:54 -06:00
Vasco Lavos 40a959fde1 Update contributors.properties 2018-11-29 01:12:50 +00:00
Vincent Lee 968a3b4742 Merge pull request #2768 from Hubry/tc-integration
Tweaks to Thaumcraft integration
2018-11-26 12:07:01 -06:00
Hubry e5d457dc3b Tweaks to Thaumcraft integration
* Move TC brew recipes to init, postinit was too late for aspects
* Add brew aspects
* Replace wood and stone stacks with their aspects, avoids livingwood having just Victus
* Reduce the amount of wildcard metadata, it is not best practice when it can be avoided
* Tweak a few aspect lists
* Remove entities that are just entity form of items
* Add missed Spectrolus aspects
2018-11-26 10:49:56 +01:00
Vincent Lee b3b18b90e6 Merge pull request #2762 from Hubry/aggregator-tooltip
Fix Life Aggregator tooltip being always "entity..name"
2018-11-25 23:23:53 -06:00
Vincent Lee a84397a9fe Fix some deprecation warnings 2018-11-25 23:19:36 -06:00
Vincent Lee e9ba8392d0 Fix #2784 2018-11-25 23:02:33 -06:00
Vasco Lavos ab93acfc34 Update contributors.properties 2018-11-21 20:17:58 +00:00
Vincent Lee 68c24519b3 Merge pull request #2781 from Hubry/horses
Fix horse viruses replacing attributes and turning horses into babies
2018-11-19 20:57:31 -06:00
Vincent Lee 0aff10acfe Merge pull request #2782 from Hubry/cnb-imc
Fix Botania glass blocks being unchiselable with Chisels and Bits
2018-11-19 20:56:27 -06:00
Hubry 16bd2483f6 Fix Botania glass blocks being unchiselable with Chisels and Bits 2018-11-19 23:50:29 +01:00
Hubry 07c50a68d2 Fix horse viruses replacing attributes and turning horses into babies 2018-11-19 23:06:03 +01:00
Vasco Lavos 83bbf64acb buildy 2018-10-24 00:58:41 +01:00
Vincent Lee 642e300aa1 Merge pull request #2766 from Hubry/manifest-fix
Attempt to fix ATs in jar manifest, and add sources jar
2018-10-15 12:13:07 -05:00
Hubry 7d8ddb4d6f Try to fix #2536 and add sources jar 2018-10-15 16:15:18 +02:00
Vincent Lee 3bebde687e Fix #2764 2018-10-13 02:14:51 -05:00
Hubry 7dcaf2599a Fix Life Aggregator tooltip being always "entity..name" 2018-10-11 12:51:19 +02:00
Vincent Lee 9eae466d30 Cleanup in ToolCommons, fix a stack null in bow 2018-10-09 00:47:51 -05:00
Vincent Lee c402bd01b6 Merge pull request #2755 from Hubry/jei-corporea-recipe
Add JEI recipe gui support for the corporea request key
2018-10-08 23:46:02 -05:00
Vincent Lee 476bed4555 Merge pull request #2758 from Zhiyu-Yang/master
Update zh_cn.lang
2018-10-07 22:24:35 -05:00
Zhiyu Yang 07f3f7cef5 Update zh_cn.lang 2018-10-08 00:22:43 +08:00
Hubry 3f47c4866c Add JEI recipe gui support for the corporea request key
Bumps required JEI version to 4.13.1.220, which added the required hook.
2018-10-03 12:37:34 +02:00
Vincent Lee 5442b97f18 Merge pull request #2751 from SaurabhTotey/master
Added null-check to PlatformModel for #2684
2018-10-01 18:12:48 -05:00
Saurabh Totey 46713ef180 Added null-check to PlatformModel for #2684 2018-10-01 13:46:11 -06:00
Vincent Lee bd2c468ba4 Safety checks to fix #2727 2018-09-25 10:39:24 -05:00
Vincent Lee d10df52b92 Merge pull request #2745 from Hubry/jei-brews
Improve handling of brews in JEI
2018-09-17 17:11:14 -05:00
Hubry 3bf7e07546 Improve handling of brews in JEI
* Add subtype interpreters to make looking up specific brew recipes less annoying
* Add blood pendants and incense sticks to the brew recipe wrapper
* Add locking of the other ingredient, so that when an item is focused, the other ingredient does not change to the items that don't fit
  (eg. you looked up the flask of fleetfeet, the input no longer swaps between vials and flasks)
2018-09-17 13:06:46 +02:00
Vincent Lee 25d37b9c0c Merge pull request #2741 from codewarrior0/metastone-weight-lens
Allow Metamorphic Stones to be silk-dropped by a Weight Lens
2018-09-15 12:23:00 -05:00