Fix faulty pane culling (vanilla bug)

Fix recipe conflicts, making chiseled botania bricks craftable again. Closes #29
Fix nulls getting into FakeWorldAccess. Closes #143
2026-10-26 22:34:08 +00:00 · 2016-02-29 21:49:54 -06:00 · 2016-02-29 21:30:33 -06:00 · 2016-02-29 20:41:53 -06:00 · 2016-02-29 20:35:48 -06:00 · 2016-02-29 20:18:43 -06:00
681 changed files with 7939 additions and 5780 deletions
@@ -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]
@@ -1,14 +1,17 @@
-1.8 PORT README:
+README:

-This is williewillus' 1.8(.8) port of Botania!
+This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above

-All licensing and distribution rights are exactly as 1.7.10 Botania
+All licensing and distribution rights are exactly as 1.7.10 Botania.

 Use at your own risk as bugs may pop up unexpectedly.

-I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No.
+As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny.
+
+Please report all 1.8+ issues to this repository.
+
+These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.

-Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S.

 ![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)  
 Welcome to the Botania repository.
Author	SHA1	Message	Date
Vincent Lee	70942d7089	Fix faulty pane culling (vanilla bug)	2016-02-29 21:49:54 -06:00
Vincent Lee	38ca4b429d	Fix recipe conflicts, making chiseled botania bricks craftable again. Closes #29	2016-02-29 21:30:33 -06:00
Vincent Lee	be9e4f731f	Fix nulls getting into FakeWorldAccess. Closes #143	2016-02-29 20:41:53 -06:00
Vincent Lee	fefb5b5cc4	Tweak corporea funnel lexicon entry, closes #144	2016-02-29 20:35:48 -06:00
Vincent Lee	1c752992cf	Fix bore+warp lenses breaking the destination block. Closes #149	2016-02-29 20:18:43 -06:00
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	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	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	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 .	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
Vincent Lee	779cc7604c	Tweak corporea funnel behavior to accomodate 1.8 item frame changes. Closes #81 .	2016-01-26 12:39:32 -06:00
Vincent Lee	ad8cf9de8a	Blockstate tweak in flowers, pick block fix for tall flowers	2016-01-26 12:18:23 -06:00
Vincent Lee	78308cdb01	Probably should have teh null check first. CLoses #73	2016-01-26 11:35:49 -06:00
Vincent Lee	d203cf3fe4	Fix water bowls being unacquirable. Closes #75 .	2016-01-26 11:28:39 -06:00
Vincent Lee	9c58319e68	Fix rod of the seas using faulty placement logic that's gone in 1.8. Closes #78 .	2016-01-26 11:19:22 -06:00
Vincent Lee	a7080b2439	Working! now need to smooth it out	2016-01-25 12:35:39 -06:00
Vincent Lee	becc642b85	Animation now correct	2016-01-25 12:25:54 -06:00
Vincent Lee	a94a86b9ce	Minor hourglass optimization. Closes #76	2016-01-25 10:07:50 -06:00
Vincent Lee	4926137ff0	ITS ALIVE	2016-01-25 09:52:04 -06:00
Vincent Lee	67605075d8	More work on animation api	2016-01-25 09:38:04 -06:00
Vincent Lee	89e00c7ae8	First attempt at animation API	2016-01-25 00:19:04 -06:00
Vincent Lee	7601eecba3	Fix pylons not showing their fancy particles	2016-01-24 18:19:24 -06:00
Vincent Lee	0887f76575	Some cleanup in incense plate tesr, move red string tesr to fasttesr, remove life imbuer tesr	2016-01-24 18:10:41 -06:00
Vindex	f44d846d32	Added support for StorageDrawers and Deep Storage API	2016-01-24 22:44:30 +01:00
Vincent Lee	79210e484c	Delete unneeded LibRenderIDs	2016-01-24 14:18:30 -06:00
Vincent Lee	fddf546474	Cleanup and reformat: Delete all ISBRH's and IItemRenderers besides book, reformat to tabs in my new classes, add missing copylefts	2016-01-24 14:15:41 -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
Vincent Lee	eb7a6aee50	Tweak the bandaid	2016-01-23 23:55:05 -06:00
Vincent Lee	5104ff52d6	Tweak to bandaid	2016-01-23 23:13:59 -06:00
Vincent Lee	aee5b8c0c2	Revert "Giant annoying message to see where this happens" This reverts commit `08fa70e25c`.	2016-01-23 22:45:43 -06:00
Vincent Lee	08fa70e25c	Giant annoying message to see where this happens	2016-01-23 22:41:20 -06:00
Vincent Lee	ac72a5a660	Attempt number 991298 to patch the stupid client crash	2016-01-23 22:36:49 -06:00
Vincent Lee	400bf95a44	Fix some lingering GoG worldgen and rendering issues. Closes #8 .	2016-01-23 16:56:30 -06:00
Vincent Lee	ba3d9ff9f8	Update garden of glass	2016-01-23 16:44:34 -06:00
Katrix-	d1c309f8ae	UUID for relics Maybe better name for a few uuid methods?	2015-12-27 03:44:40 +01:00