Commit Graph
4761 Commits
Author SHA1 Message Date
Vincent Lee c6420168aa Fix another problem caused by shifting idmap. Closes #147 2016-02-29 19:00:15 -06:00
Vincent Lee ae89d0f18d Shim to avoid potion idmap shifting on startup. Closes #148 2016-02-29 18:56:08 -06:00
Vincent Lee ef2ab91b37 All basic tiles 2016-02-28 20:46:01 -06:00
Vincent Lee 59232209a4 Redstrings 2016-02-28 15:57:59 -06:00
Vincent Lee 20ab306985 Merge branch 'MC18' into capability 2016-02-28 15:45:20 -06:00
Vincent Lee 076a7ee23a Tweak tesr guards. closes #142 2016-02-28 14:58:18 -06:00
Vincent Lee b12cd80ad3 Update forge and close #52 2016-02-28 12:20:11 -06:00
Vincent Lee 6d7fe40cd3 Fix pink wither being too aggressive in showing its love. Closes #141 2016-02-28 11:48:42 -06:00
Vincent Lee e4401efeb6 Hopperhock 2016-02-28 10:53:01 -06:00
Vincent Lee a3c30caa40 Make it compile 2016-02-28 01:44:16 -06:00
Vincent Lee 1580790398 Merge upstream final release 2016-02-28 01:29:25 -06:00
Vincent Lee 8f89b630a5 Merge pull request #140 from blacksmithgu/MC18
Update ItemManaRing to also use durability bar instead of damage
2016-02-28 01:16:54 -06:00
Michael Brenan 861357f313 Update ItemManaRing to also use durability bar instead of damage 2016-02-27 23:40:25 -06:00
Vincent Lee 84b171603d Fix planestrider's sash. Closes #139 2016-02-27 15:31:50 -06:00
Vincent Lee ae356abcfe Reorganize 2016-02-27 14:12:39 -06:00
Vincent Lee d498b7cd2e Fix floating flower spinning (thanks gigaherz and tterrag) Closes #9 2016-02-26 21:15:31 -06:00
Vincent Lee 50420c3b4b Sigh 2016-02-26 20:39:50 -06:00
Vincent Lee 99e9cac30a Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-26 19:53:12 -06:00
Vincent Lee 18ea3e6bfb Pure daisy now allows variable time recipes, closes #137. 2016-02-26 19:48:43 -06:00
Vincent Lee f51540fd52 Update README.md 2016-02-25 14:56:00 -06:00
Vasco Lavos f8a4018ec7 Build 249 2016-02-25 19:53:29 +00:00
Vasco Lavos 0ee62f53e3 Added back the passive decay time config. 2016-02-25 19:32:36 +00:00
Vasco Lavos fd5606d02d Merge pull request #1775 from the-vindex/master
Added support for StorageDrawers and Deep Storage API
2016-02-25 19:20:13 +00:00
Vasco Lavos 94d94b6c79 Merge pull request #1811 from elbo2525/master
Add ja_JP.lang
2016-02-25 19:20:04 +00:00
Vincent Lee 47001131b0 Move specialflower statemapper to where it belongs v0.6.2-beta 2016-02-22 23:17:52 -06:00
Vincent Lee 1ed833a4a7 Fix mistake in spawnerclaw, made debug atlas dump harder to trigger 2016-02-22 23:10:01 -06:00
Vincent Lee 9d6c10f354 Slight tweaks to corporea cube rendering 2016-02-22 22:03:57 -06:00
Jonathan Smith 52db87735a Merge pull request #1815 from 3TUSK/zh_CN_update
Update zh_CN.lang to latest ver.
2016-02-22 14:07:55 +00:00
Urey.X c9281021b6 Update zh_CN.lang to latest ver.
Also archived the old translation at the end of file.
2016-02-22 08:24:26 -05:00
Vincent Lee 9b3579fe56 Fix touching client classes in methodhandles. Closes #129 2016-02-21 17:03:28 -06:00
elbo2525 d5a3a056f5 Add ja_JP.lang 2016-02-21 10:51:46 +09:00
Vincent Lee d7d4440b0e Update spawner claw to use methodhandles 2016-02-20 18:19:03 -06:00
Vincent Lee 91d234e6ed Fix life aggregator being completely broken 2016-02-20 17:40:20 -06:00
Vincent Lee b4d69dbac2 Fix aesir not binding drops to uuid 2016-02-20 17:26:29 -06:00
Vincent Lee 7967f25c1c Change a bunch of heavy reflection to use methodhandles 2016-02-20 17:24:31 -06:00
Vincent Lee b6427bcae9 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-20 13:34:46 -06:00
Vincent Lee 90f793508a Tentative uuid fix for relics. #124 2016-02-20 13:34:16 -06:00
Vincent Lee db6ccb9016 Merge pull request #123 from kevsgrove/patch-1
Update BlockSolidVines.java
2016-02-19 12:44:10 -06:00
Jonathan Smith 3d5a8aab19 Merge pull request #1810 from NatsuArashi/patch-1
Update zh_TW.lang
2016-02-19 17:14:01 +00:00
kevsgrove 59939824a3 Update BlockSolidVines.java 2016-02-19 07:08:12 -08:00
NatsuArashi 0c75bc9356 Update zh_TW.lang 2016-02-19 20:32:48 +08:00
Vincent Lee ad5b7fd73b Merge upstream 2016-02-18 10:04:02 -06:00
Vincent Lee 4f8376a148 Fix dark quartz disabled crashing client (Renari), other cleanups in modelhandler. Closes #119. v0.6.1-beta 2016-02-18 09:26:16 -06:00
Vincent Lee 9e0c7ba0c7 Cleanup in modelhandler, tweak to caching in corporea cube renderer 2016-02-17 17:49:54 -06:00
Vincent Lee 769ed577c4 Fix a rare crash rendering the debug screen 2016-02-17 16:52:07 -06:00
Vincent Lee 78c65fb065 All apothecaries done finally v0.6-beta 2016-02-16 13:34:26 -06:00
Vincent Lee a647f4c784 Mountain apothecary 2016-02-15 16:21:54 -06:00
Vincent Lee 37d63bc672 Remove some top level sideonlys where they werent meant to be used, fix wireframes rendering too opaquely 2016-02-14 22:31:00 -06:00
Vincent Lee 333102a08f Lambdaify shadercallback 2016-02-14 19:13:25 -06:00
Vincent Lee d1ff5e89ca Merge upstream pull request #1693 from Katrix-/relicsUUID 2016-02-14 10:54:35 -06:00