Vincent Lee
eaaa55fdb0
Merge master
2019-01-16 14:46:30 -06:00
Vincent Lee
3e4b6a818c
Fix #2827
2019-01-16 12:00:29 -06:00
Vincent Lee
c019ba3864
Merge pull request #2826 from tcheinen/master
...
fix #2825 (manasteel and elementium shears drop apples and saplings)
2019-01-15 22:25:56 -06:00
Teddy Heinen
c1f6c1c5be
fix #2825 (manasteel and elementium shears drop apples and saplings)
2019-01-15 20:36:38 -06:00
Vasco Lavos
cc4b05f31f
Update contributors.properties
2019-01-15 22:53:23 +00:00
Vasco Lavos
024ea95c8c
Update contributors.properties
2019-01-14 21:04:29 +00:00
Vasco Lavos
7cdb5b747a
Update contributors.properties
2019-01-10 01:14:14 +00:00
Vasco Lavos
7b5daf0b64
Update contributors.properties
2019-01-09 00:01:21 +00:00
Vasco Lavos
0c0700f3e8
Update contributors.properties
2019-01-08 21:52:42 +00:00
Vincent Lee
01d1e9df4b
Fix #2822
2019-01-07 16:54:46 -06:00
Vincent Lee
f7eb9422e6
Make Diva Charm/Heisei Dream less janky, and fix diva charm particles not being visible. Closes #2820
2019-01-07 16:39:48 -06:00
Vasco Lavos
32b5658c25
Update contributors.properties
2019-01-05 20:58:30 +00:00
Vincent Lee
81970e1833
Merge pull request #2816 from trunksbomb/master
...
Update en_us.lang
2019-01-05 00:47:43 -06:00
trunksbomb
899c39c523
Remove accidental line duplication
...
Signed-off-by: trunksbomb <[email protected] >
2019-01-03 20:12:39 -05:00
Vincent Lee
27ec538ea1
Merge pull request #2818 from Hubry/gradle
...
Cleanup buildscript, add api jar, update gradle
2019-01-03 11:38:33 -06:00
Hubry
d4c6b6629c
Simplify buildscript, add api jar, update gradle
...
Gradle updated to 4.9.
Replaced the weird gradle stuff with a thing taken from Patchouli
Removed the forgecraft task with that, it wasn't used anymore anyways
Added an api jar containing api classes + source
Replacing deprecated << uses with doLast, minor styling tweaks
2019-01-03 16:29:47 +01:00
trunksbomb
174afe0c6d
Fixed some typos in en_us.lang, left "flavor text" alone for the most part
...
Signed-off-by: trunksbomb <[email protected] >
2019-01-01 22:55:58 -05:00
Vasco Lavos
5b5108c43c
Update contributors.properties
2019-01-02 03:48:20 +00:00
Vasco Lavos
4d82f65766
Update contributors.properties
2018-12-31 03:44:22 +00:00
Vasco Lavos
13f8e6d02c
Update contributors.properties
2018-12-29 02:19:44 +00:00
Vasco Lavos
921e63e814
Update contributors.properties
2018-12-27 17:30:29 +00:00
Vincent Lee
9e8dcbd51b
Fix #2694 by imposing a limit of 256 blocks (16 chunks view distance)
2018-12-25 22:49:13 -06:00
Vincent Lee
daff8ece87
Fix spell cloth duplication glitch #2810
2018-12-25 22:23:16 -06:00
Vincent Lee
43734ee338
Revert "Fix sparks/corporea sparks blocking arrows and digging"
...
Doing this prevents the wand from targeting it too...
This reverts commit 5393a5202a .
2018-12-25 22:15:27 -06:00
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