Compare commits

...
88 Commits
Author SHA1 Message Date
Vincent Lee 47001131b0 Move specialflower statemapper to where it belongs 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
Vincent Lee 9b3579fe56 Fix touching client classes in methodhandles. Closes #129 2016-02-21 17:03:28 -06: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
kevsgrove 59939824a3 Update BlockSolidVines.java 2016-02-19 07:08:12 -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. 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 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
Vincent Lee 9fe4e0f8cc Kinda migrated crystal cuvbe to json 2016-02-13 12:28:52 -06:00
Vincent Lee b6204f9a41 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-12 23:07:36 -06:00
Vincent Lee 988e80a3f2 Initial attempt at animated corporea crystal cube 2016-02-12 23:07:21 -06:00
Vincent Lee d1d8eb801c Actually commit the texture 2016-02-12 22:05:22 -06:00
Vincent Lee f7902ae574 Merge pull request #115 from KaseiFR/MC18
Fix RF interaction with the Mana Fluxfield
2016-02-12 20:54:54 -06:00
KaseiFR d7bb959a87 Fix RF integration
Buildcraft pipes are particularly sentitive to directions.
2016-02-13 03:29:14 +01:00
TheWhiteWolves b0fe511fc8 Add the Clayconia Petite (X & Z range 2, Y range 1), Closes #1805 2016-02-13 01:09:21 +00:00
Jonathan Smith fc9470777b Merge pull request #1802 from yrsegal/master
Multiparts now work on both the client and the server.
2016-02-11 12:10:36 +00:00
Vincent Lee bef96830bb Pump head texture 2016-02-11 00:29:46 -06:00
Vincent Lee a20e510318 Merge pull request #114 from GirafiStudios/MC18
Updated to official RF API.
2016-02-10 21:26:08 -06:00
yrsegal a0d0f2ba65 Multiparts now work on both the client and the server. 2016-02-10 16:57:20 -05:00
Vasco Lavos 044e61f73f Merge pull request #1801 from Vazkii/revert-1800-master
Revert "Multiparts now work on both the client and the server."
2016-02-10 21:49:31 +00:00
Vasco Lavos abc7756a9b Revert "Multiparts now work on both the client and the server." 2016-02-10 21:49:26 +00:00
Jonathan Smith c8a01f7da0 Merge pull request #1800 from yrsegal/master
Multiparts now work on both the client and the server.
2016-02-10 21:48:58 +00:00
GirafiStudios ba944db343 Updated to official RF API. 2016-02-10 20:33:21 +01:00
yrsegal 59b177e231 Multiparts now work on both the client and the server. 2016-02-10 13:51:31 -05:00
Jonathan Smith 27a5991350 Merge pull request #1798 from isochronous/lex-botania-lang_en-corrections
Lexica Botania lang_en corrections
2016-02-10 08:03:22 +00:00
Jeremy McLeod e0023c0566 Corrected spelling & grammar in Lexica Botania for:
- Manastorm Charge
- Teru Teru Bozu
- Mana Blaster
- Rod of the Lands
- Manasteel Equipment
- Terrasteel Armor
- Terra Shatterer
2016-02-09 19:42:56 -05:00
Vincent Lee d3e1bf80b4 Fix star particle - corporea index and manastorm charge 2016-02-08 22:39:32 -06:00
Vincent Lee 006519bcf5 Slightly nerfed path speed boost 2016-02-08 22:23:23 -06:00
Vincent Lee e522d8e24c comment out debug output 2016-02-08 21:44:04 -06:00
Vincent Lee c7d28c57de Partial fix for platform + smartmodels 2016-02-08 13:03:38 -06:00
Vincent Lee 972d0e5bf6 Safety check in platform model, update JEI 2016-02-08 10:18:12 -06:00
Vincent Lee 2b57a2232d Update lexicon to reflect new corporea funnel item frame values 2016-02-07 22:07:42 -06:00
Vincent Lee b9b066617a Fix floating flower lightlevel crash 2016-02-07 21:55:44 -06:00
Vincent Lee 512884729e Tweak mossy apothecary break texture, fix lexicon crash again 2016-02-07 21:54:11 -06:00
Vincent Lee 2ab491867e Revert "Fix lexicon npe, closes #94"
This reverts commit 6f6f330a5a.
2016-02-07 21:50:53 -06:00
Vincent Lee 3f5159fe75 Mossy apothecary 2016-02-07 19:09:46 -06:00
Vincent Lee 0f41f1fcc0 Add zipped form of alt textures 2016-02-07 12:06:04 -06:00
Vincent Lee f41e393322 Mesa apothecary split 2016-02-07 11:51:07 -06:00
Vincent Lee 1de5048653 More lexicon model work 2016-02-07 11:47:25 -06:00
Vincent Lee 7e1ef7aa7f Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102 2016-02-06 23:54:28 -06:00
Vincent Lee fe1d88379d Fix AABB derp in rod of the skies, closes #98 2016-02-06 22:54:40 -06:00
Vincent Lee 8cf71200ee More lexicon faffing 2016-02-06 22:39:43 -06:00
Vincent Lee 26bc6b0059 Split out alt resources 2016-02-06 15:57:16 -06:00
Vincent Lee b6f51f1ccf Preliminary work on lexicon first person model 2016-02-05 19:57:29 -06:00
Vincent Lee 7e642cb03a Mop check for multiblocks. Closes #95 2016-02-05 15:54:42 -06:00
Vincent Lee 75ce19ddc6 Fix querying itemless blocks, closes #90 2016-02-05 15:52:44 -06:00
Vincent Lee 6f6f330a5a Fix lexicon npe, closes #94 2016-02-05 15:50:46 -06:00
Vincent Lee eedfff10f1 Fix the warp ward recipe 2016-02-05 15:47:28 -06:00
Vincent Lee 65fe04af3a Restore thaumcraft integration. Closes #74 2016-02-05 13:36:59 -06:00
Jonathan Smith 6135f44792 Merge pull request #1788 from isochronous/patch-1
Fixed a typo
2016-02-05 00:08:26 +00:00
Jeremy McLeod 5270f5ea20 Fixed a typo
adjusted != adjacent
2016-02-04 15:20:30 -05:00
Vincent Lee b8e06a3d36 update readme 2016-02-03 16:59:00 -06:00
Jonathan Smith ea10c48439 Merge pull request #1783 from nekosune/master
Added quartz variants to Ore Dictionary
2016-02-02 22:05:43 +00:00
nekosune 3593d4b759 Added quartz variants to Ore Dictionary 2016-02-02 21:59:03 +00:00
nekosune 9e37f37c53 Added quartz variants to Ore Dictionary 2016-02-02 21:40:38 +00:00
Vasco Lavos f0f372205c Update contributors.properties 2016-02-02 17:35:45 +00:00
Jonathan Smith 7bfeef18a9 Merge pull request #1782 from PikadudeNo1/patch-1
Fixed Marimorphosises having incorrect downward range
2016-02-01 14:55:50 +00:00
Pikadude No. 1 9a60705967 Fixed Marimorphosises having incorrect downward range 2016-02-01 04:45:47 -08:00
Jonathan Smith 0e617e6046 Merge pull request #1781 from howtonotwin/inkwellfix
Newly infused mana inkwells show durability bar
2016-02-01 09:38:19 +00:00
Vincent Lee 2fdcbdb668 Fix compile error and a few more warnings. 2016-02-01 00:16:18 -06:00
Vincent Lee 576362e400 Big cleanup (begone unchecked warnings!) 2016-02-01 00:08:10 -06:00
Vincent Lee edceea8922 Clean up some jsons 2016-01-31 20:03:03 -06:00
Rasheeq d32ce6c519 Newly infused mana inkwells show durability bar
No more confused players!
Also fixes williewillus/Botania#91.
2016-01-31 20:54:54 -05:00
Vincent Lee 727d0480df Some tweaks to life imbuer 2016-01-30 23:21:29 -06:00
Vincent Lee a0494475dd Fix several glcolorub's leaking 2016-01-30 17:31:34 -06:00
Vincent Lee 6e48bb9a44 Fix thorn chakram render, make it remember the stack used to thrown it (name will persist, etc.) 2016-01-30 16:19:33 -06:00
Vincent Lee bc29d37446 Finish off baubles. Closes #49. 2016-01-29 21:00:48 -06:00
Jonathan Smith e0293afad0 Merge pull request #1779 from NatsuArashi/patch-15
Update zh_TW.lang
2016-01-29 09:13:18 +00:00
NatsuArashi dfb2ef2a61 Update zh_TW.lang 2016-01-29 16:08:29 +08:00
Vincent Lee 7db49dae78 Fix heisei dream being completely broken 2016-01-28 11:55:46 -06:00
Vincent Lee 4ac196eae3 Tweak corporea item frame filter again 2016-01-27 21:19:44 -06:00
Vincent Lee 2071fa16d2 Fix trodden dirt being wonky. Closes #68. 2016-01-27 21:09:15 -06:00
Vincent Lee 75e07e9653 Bump to recommended forge 2016-01-27 20:33:29 -06:00
TheWhiteWolves 74d4130ba5 Add some default entities from vanilla and botania to the gravity rod blacklist 2016-01-24 17:39:04 +00:00
Katrix- d1c309f8ae UUID for relics
Maybe better name for a few uuid methods?
2015-12-27 03:44:40 +01:00
573 changed files with 2686 additions and 1858 deletions

No files matched your search

+2 -1
View File
@@ -13,6 +13,7 @@ Anyways, vanilla removed it from their method so we follow suit.
* Removed icon methods from SubTileSignature
-- Other --
* Lang entries to be updated in non-english: Corporea funnel new numbers. Moving of prismarine entry.
* Most things left untouched to make patches from upstream easier
* Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances
since BlockPos'es are immutable and thus can be reused everywhere.
@@ -25,4 +26,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is
* Quartz stair textures may be assigned incorrectly - resource pack authors check me
* Glass pane inner faces are not getting culled (vanilla bug?)
* Some item forms of technical/non-user blocks are removed
* Full list: [all double slab items, all solid vine items]
* Full list: [all double slab items, all solid vine items]
+3
View File
@@ -10,6 +10,9 @@ I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or
Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S.
These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.
![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)
Welcome to the Botania repository.
Binary file not shown.
Loaded 100 of 573 files, more files were not shown because too many files have changed in this diff. Show more