Vincent Lee
93174616c7
Fall back to null sided cap
2016-03-07 14:01:13 -06:00
Vincent Lee
63f160b78b
A reference <3
2016-03-07 13:40:08 -06:00
Vincent Lee
bb89013f1e
According to lexicon sparks only read from top of inventory
2016-03-07 13:36:27 -06:00
Vincent Lee
1229141b2f
Fix sparks not being colored by network
2016-03-07 13:20:49 -06:00
Vincent Lee
9f1a2b8a7d
Retrofit corporea to work with capabilities
2016-03-07 13:09:59 -06:00
Vincent Lee
cda20175c8
Fix derp when removing workaround. closes #161 , #162 , #163
2016-03-07 09:40:02 -06:00
Vincent Lee
46ec4b8127
Tweak guard in shedding config. Closes #153
2016-03-06 17:50:55 -06:00
Vincent Lee
8f46355769
Spreader item models. Closes #4 . Also fix third person pool model and restore old lexicon model until I'm ready to tackle it
2016-03-06 14:19:28 -06:00
Vincent Lee
93f869a8f5
Removed duplicate pool textures
2016-03-06 12:20:34 -06:00
Vincent Lee
3084b058da
Cleanups in API
2016-03-05 22:02:22 -06:00
Vincent Lee
db23bffea6
Remove future references to 1.8 from lang file
2016-03-05 20:43:03 -06:00
Vincent Lee
0d9fe52f5d
Merge branch 'capability' into MC18
2016-03-05 20:30:08 -06:00
Vincent Lee
036fc4b0cc
Use cap's native serialization
2016-03-05 12:12:29 -06:00
Vincent Lee
67bcd94edf
Fix inverted potion condition
2016-03-05 09:30:44 -06:00
Vincent Lee
9975f4b028
Make piston relays not stringly typed
2016-03-05 01:34:00 -06:00
Vincent Lee
274b4ab05a
onContentsChanged exists
2016-03-04 23:07:16 -06:00
Vincent Lee
b581a5544b
Fix memory usage problem caused by vanilla
2016-03-04 22:22:07 -06:00
Vincent Lee
28f4321cfb
Derp missed one
2016-03-04 21:33:28 -06:00
Vincent Lee
3c5f588431
Get rid of BlockContainer
2016-03-04 11:01:55 -06:00
Vincent Lee
19ed5877df
Make API java 7 compileable, so that people who have an optional botania dep don't have to use java 8
2016-03-03 10:33:57 -06:00
Vincent Lee
2f1bc4188a
Prevent mobs from riding pool cart
2016-03-03 09:49:15 -06:00
Vincent Lee
9aa6405566
Remove debug output
2016-03-02 22:14:08 -06:00
Vincent Lee
40bad433c8
Fel pumpkin can now be placed from dispensers
2016-03-02 22:13:45 -06:00
Vincent Lee
01ca175951
Remove tile ticking shim
2016-03-02 14:15:45 -06:00
Vincent Lee
298d46399f
Derp
2016-03-02 14:01:40 -06:00
Vincent Lee
a929156626
Fix overeager TE refreshing. Closes #152 and potentially fixes #71
2016-03-02 10:30:46 -06:00
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
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
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
Vincent Lee
b3a140b8dd
Temporary bandaid for thaumcraft brew integration. Closes #69 .
2016-01-23 12:50:47 -06:00
Vincent Lee
fabedeb31a
Bump forge version, improve brewery JEI integration
2016-01-23 12:22:33 -06:00
Vincent Lee
2a738209b7
Revert "Tentative fix for multiblock transparency"
...
This reverts commit 03cfbfa73e .
2016-01-22 23:47:41 -06:00
Vincent Lee
03cfbfa73e
Tentative fix for multiblock transparency
2016-01-22 23:28:46 -06:00
Vincent Lee
eece9a08c1
Actually commit spreader blockstate json
2016-01-22 23:20:04 -06:00
Vincent Lee
e5ee04113f
placeholder model for spreader so it shows in JEI. make monocle use blockstates like it should
2016-01-22 22:32:02 -06:00
Vincent Lee
4bf8fd3b98
Remove some unused states from tiny potato
2016-01-22 21:18:54 -06:00
Vincent Lee
09fb64982a
A bunch of more baubles
2016-01-22 20:42:12 -06:00
Vincent Lee
b012f5152d
Fix fab pools not being special snowflakes (colors same between all)
2016-01-21 23:14:45 -06:00
Vincent Lee
540baa4152
A little debug thign
2016-01-21 23:06:24 -06:00
Vincent Lee
77cd24b58a
Merge upstream
2016-01-21 22:04:45 -06:00
Vincent Lee
98620bb1c5
Serverside the distributor. Closes #63
2016-01-21 21:30:22 -06:00
Vincent Lee
071bcefa6f
Anotehr hoepful bandaid for all the clientside crashes
2016-01-21 21:23:23 -06:00
Vincent Lee
2a077adb6f
Safeguard in the smartmodels. Closes #66
2016-01-21 21:21:26 -06:00
Vincent Lee
3d821e5da4
Fix some recipes not taking vanilla prismarine. closes #62
2016-01-21 21:16:00 -06:00
TheWhiteWolves
275729d54e
Popped a null check in onEquipped() to ensure player isn't null, hopefully helps with Issue #1757
2016-01-21 23:13:41 +00:00
TheWhiteWolves
adc06dc6ce
Added a blacklist to the Rod of the Shaded Mesa
2016-01-21 22:46:02 +00:00
Vincent Lee
5991387f22
Actually close #59
2016-01-20 21:35:14 -06:00
Vincent Lee
d0e4e436ad
MOve recipes to init and remove thaumcraft after requirement. CLoses #53
2016-01-20 19:52:38 -06:00
Vincent Lee
27be487b7e
Add a gradlew.bat. Closes #56
2016-01-20 19:15:46 -06:00
Vincent Lee
36976e6321
Fix divining rod looking up blocks with no item form in the OD. CLoses #57
2016-01-20 19:12:22 -06:00
Vincent Lee
a6d89e3d4d
Fix thorn chakram impact crash. Closes #59
2016-01-20 19:08:48 -06:00
Vincent Lee
ab3bc85f20
Fix magic missile crash. closes #54
2016-01-20 19:07:29 -06:00
Jonathan Smith
d8a46650ee
Merge pull request #1762 from NatsuArashi/patch-14
...
Update zh_TW.lang
2016-01-19 14:26:26 +00:00
NatsuArashi
177c5b1d1b
Update zh_TW.lang
...
FIX SOMETHING...?
2016-01-19 19:31:17 +08:00
Vincent Lee
ebf399edaa
Most body based cosmetic baubles
2016-01-18 17:08:31 -06:00
Vincent Lee
4448a6a498
Blood, ice, lava, super lava pendants and itemfinder bauble renders
2016-01-18 15:41:55 -06:00
Vincent Lee
a13d6fca53
Sideonly some things
2016-01-18 15:16:48 -06:00
Vincent Lee
fef9f1b406
Flugel tiara bauble render
2016-01-18 15:12:57 -06:00
Vincent Lee
86ce88f068
Diva charm and golden laurel baubles render
2016-01-18 14:55:28 -06:00
Vincent Lee
9b2fa9de65
Monocle baubles render
2016-01-18 14:11:21 -06:00
Vincent Lee
f87e2373f8
Tiny planet bauble render
2016-01-18 13:22:54 -06:00
Vincent Lee
4df1d500ed
Remove unnecessary face from creative pool item json
2016-01-18 12:45:52 -06:00
Vincent Lee
cec10471fb
Fix two multiblock crashes, closes #48
2016-01-18 12:15:56 -06:00
Vincent Lee
177f50ca61
Bandaid for more client chunk unload crashes >.>
2016-01-18 11:45:07 -06:00
Vincent Lee
e184394f55
Fix mana tablets and terrasteel helm will rendering
2016-01-18 11:30:13 -06:00
Vincent Lee
eb28396d98
Fully fix contributor fanciness renders. Fix mana gun not being held like a tool in third person
2016-01-18 10:31:05 -06:00
Jonathan Smith
089c8c674c
Merge pull request #1760 from Eladkay/patch-3
...
Fixed license link in FAQ page.
2016-01-18 16:14:45 +00:00
Eladkay
2df3b356fd
Fixed license link in FAQ page.
...
If issue is not obvious: https://gyazo.com/c4657c529a337f37a3c67925e8e5e61e
2016-01-18 15:00:17 +02:00
Vincent Lee
dda3151b73
Fix piston lens not working properly. Serverside some of the other lenses where safe
2016-01-17 17:30:01 -06:00
Vincent Lee
4e5cb59ebe
Fix crash and possible desync in flash lens. Closes #47
2016-01-17 16:41:37 -06:00
Vincent Lee
fef0857603
Desert, forest, fungal apothecary textures
2016-01-17 16:31:01 -06:00
TheWhiteWolves
a6896f250f
bump API version
2016-01-17 14:51:51 +00:00
TheWhiteWolves
d431207eec
Change to use API version of disposable blocks and implement semi-disposable
2016-01-17 14:51:39 +00:00
TheWhiteWolves
c0e7353192
Move disposable blocks list to API and add hook and semi disposable list
2016-01-17 14:50:50 +00:00
Vincent Lee
8922ad5362
Use the non-insane calendar API
2016-01-16 18:38:22 -06:00
Vincent Lee
be2b66dddf
Partially restore bauble rendering. Everything is probably in the wrong place, but should render.
2016-01-16 18:25:31 -06:00
Vincent Lee
6e870f4e79
Remove some leftover debug messages
2016-01-16 16:57:51 -06:00
Vincent Lee
4d4ba74ac1
Fix ender air bottle event handler not being registered, closes #44
2016-01-16 16:56:17 -06:00
Vincent Lee
5e3345a1d7
Fix terra pick and elementium shovel not working correctly. Closes #43
2016-01-16 13:37:18 -06:00
Vincent Lee
568ee043df
God dammit
2016-01-16 12:33:05 -06:00
Jonathan Smith
f2eea3ce92
Merge pull request #1754 from blacksmithgu/swapper-sides
...
Bugfix followup - Block swappers use sidedness to control concurrency
2016-01-16 11:19:02 +00:00
Vincent Lee
a615538289
Stop spamming packets when done digesting
2016-01-16 02:07:18 -06:00
Vincent Lee
7907d1d582
Fix passives decaying directly into nothing instead of a dead bush
2016-01-16 01:57:31 -06:00
Vincent Lee
46900df6cb
Serverside gourmaryllis
2016-01-16 01:42:07 -06:00
Vincent Lee
1d8c536139
Fix pool minecart rendery fully
2016-01-15 21:48:29 -06:00
Vincent Lee
eb028d6c05
Fully fix mana pool models
2016-01-15 21:20:49 -06:00
Michael Brenan
24cf30a29e
Bugfix followup - Block swappers use sidedness to control concurrency
2016-01-15 18:28:06 -06:00
Jonathan Smith
5bc520368d
Merge pull request #1752 from blacksmithgu/patch-1749
...
Fix #1749 - Mana Tablets no longer lose durability in storage drawer
2016-01-15 21:28:32 +00:00
Vincent Lee
406f89a968
Cleanup, implement some easter egg models I missed
2016-01-15 14:14:10 -06:00
Vincent Lee
2c15b6150c
Lots of MOP guards. closes #41
2016-01-15 11:27:32 -06:00
Vincent Lee
bee13337ad
Made laputa shard save string block id's instead of integer id's. Also, a possible fix for #40
2016-01-15 10:56:23 -06:00
Michael Brenan
54f1dd0478
Fix #1749 - Mana Tablets no longer lose durability in storage drawer
2016-01-15 03:26:31 -06:00
Jonathan Smith
b7c0c12e5b
Merge pull request #1750 from blacksmithgu/swapper-concurrency
...
Add preemptive bugfix - Swappers now threadsafe
2016-01-15 09:09:26 +00:00
Michael Brenan
5438138c93
Add preemptive bugfix - Swappers now threadsafe
2016-01-14 22:56:01 -06:00
Vincent Lee
98e28a0967
Made some things one sided only
2016-01-14 22:44:50 -06:00
Vincent Lee
4a4e583aa8
Fix wonky petal apothecary collision
2016-01-14 21:53:18 -06:00
Vincent Lee
300b1926de
Possible fix for #38
2016-01-14 17:20:05 -06:00
Vincent Lee
3818d2879d
no longer register gaia tesr onto vanilla skulls
2016-01-14 16:47:48 -06:00
Vincent Lee
e12163f70c
Merge upstream
2016-01-14 16:40:14 -06:00
Vincent Lee
dcb236607d
Fix hopperhock placing items one block too far away. Closes #39
2016-01-14 12:08:57 -06:00
Vincent Lee
08de553593
No longer use the raw potion array, use potio registry
2016-01-14 11:54:08 -06:00
Jonathan Smith
f6bf6589ad
Merge pull request #1743 from yrsegal/master
...
IslandTypes can now be added by addons
2016-01-14 16:59:20 +00:00
Jonathan Smith
da43dd8ca0
Merge pull request #1748 from blacksmithgu/patch-1722
...
Hotfix #1722 - Allow client to control sash speedup and slowdown
2016-01-14 16:55:01 +00:00
Jonathan Smith
fdd1ad8d4e
Merge pull request #1747 from blacksmithgu/patch-1726
...
Fix #1726 - Accessories on other players now render in the proper position
2016-01-14 16:54:53 +00:00
Jonathan Smith
d4dd4cf42f
Merge pull request #1746 from blacksmithgu/gaia-head
...
Clean up common/item/ItemGaiaHead.java
2016-01-14 16:54:46 +00:00
Michael Brenan
0595397943
Hotfix #1722 - Allow client to control sash speedup and slowdown
2016-01-13 23:07:47 -06:00
Michael Brenan
d0faf3c3c6
Fix #1726 - Accessories on other players now render in the proper position
2016-01-13 22:53:21 -06:00
Vincent Lee
b01e9dfed7
Staging changes would be a good idea. Also fix possible potion crash
2016-01-13 17:14:12 -06:00
yrsegal
cbac5fbb32
IslandTypes can now be added by addons
2016-01-13 17:44:47 -05:00
Michael Brenan
f5210997ca
Clean up common/item/ItemGaiaHead.java
2016-01-13 16:21:47 -06:00
Vincent Lee
4b7608fc2a
Add nag that this is unofficial right now
2016-01-13 14:13:19 -06:00
Vincent Lee
103efe9c7b
Destitch cocoon texmap
2016-01-13 12:54:02 -06:00
Vincent Lee
1402e2a50a
Start work on destitching apothecary texmaps
2016-01-13 12:37:15 -06:00
Vincent Lee
c8d9764fe3
Read atlas size dynamically
2016-01-13 10:59:10 -06:00
Jonathan Smith
d3055c4c4d
Merge pull request #1742 from blacksmithgu/patch-1700
...
Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic
2016-01-13 12:24:40 +00:00
Jonathan Smith
c94df0bf67
Merge pull request #1738 from blacksmithgu/master
...
Fix #1728 - Grass seeds will not spread to dirt/grass blocks under other blocks
2016-01-13 12:24:32 +00:00
Michael Brenan
4abb2cdd89
Fix #1700 - Terra Axe strictly follow 32 block range and leaf logic
2016-01-13 03:42:32 -06:00
Jonathan Smith
cabcab80e2
Merge pull request #1739 from blacksmithgu/patch-1724
...
Fix #1724 - Slabs and snow don't prevent Rod of Shifting Crust replacement
2016-01-13 09:36:21 +00:00
Vincent Lee
3e19a84b6d
Fix terra shatterer tooltip darkening screen. Closes #37
2016-01-13 00:42:32 -06:00
Vincent Lee
a30887d6f9
Debug thing for me, to dump the texture atlas
2016-01-13 00:02:18 -06:00
Vincent Lee
80bd63be0b
Bunch of TE particle textures. Fix a bellows crash and teru teru bozu not working with sunflower
2016-01-12 23:27:36 -06:00
Vincent Lee
6c9a01978a
Cocoon of caprice model
2016-01-12 15:04:08 -06:00
Vincent Lee
19e387f359
Fix off by one in forest drum meta to state
2016-01-12 13:58:19 -06:00
Vincent Lee
f799f7bc32
Revert "Trying to render AO pool"
...
This reverts commit d8a74e2e44 .
2016-01-12 12:00:29 -06:00
Jonathan Smith
a2f1776245
Merge pull request #1735 from yrsegal/master
...
Make baubles able to IBlockProvide
2016-01-12 12:59:05 +00:00
yrsegal
c20247b680
Baubles now able to IBlockProvide
...
This allows for things like Botanical Addons’ Toolbelt to provide from
the tools in them while worn.
2016-01-12 07:47:30 -05:00
Jonathan Smith
a7000e8a47
Add Material.gourd to Axe materials.
...
Closes #1732 .
Allows use of the quickest mining tool for items with Material.gourd (Pumpkins, Melons, etc.)
2016-01-12 12:12:20 +00:00
Michael Brenan
ac88d0627a
Fix #1724 - Slabs and snow prevent Rod of Shifting Crust replacement
2016-01-12 01:32:15 -06:00
Vincent Lee
d8a74e2e44
Trying to render AO pool
2016-01-11 20:06:59 -06:00
Michael Brenan
cbcc49b896
Fix #1728 - Pasture seed grass spreading obeys grass block growth rules
2016-01-11 18:28:01 -06:00
Vincent Lee
30578abfb4
Merge pull request #36 from GirafiStudios/MC18
...
Fixed special named Tiny Potatoes. (Besides Ible)
2016-01-11 17:14:30 -06:00
GirafiStudios
a172a325e1
Fixed named Tiny Potatoes rendering (Besides Ible)
2016-01-11 23:45:43 +01:00
Vincent Lee
64e3a96651
I is retarded
2016-01-11 14:25:00 -06:00
Vincent Lee
94d72161a9
Revert mesher lambdas
2016-01-11 14:10:11 -06:00
Vincent Lee
8e7f1cfac1
Temporary java 8 reobfuscation fix closes #33 .
2016-01-11 11:23:46 -06:00
Vincent Lee
f3cce3d24e
Global safety checks for blockstates while chunks are unloading
2016-01-10 22:53:21 -06:00
Vincent Lee
84204db587
Fix ender air bottle render, move to java 8, giant import cleanup
2016-01-10 18:16:30 -06:00
Vincent Lee
404d99445e
Sleeves render on spreaders again. Closes #6
2016-01-09 23:35:18 -06:00
Vincent Lee
f3f055a58e
More
2016-01-09 21:26:43 -06:00
Vincent Lee
e142561799
Model cleanup
2016-01-09 21:22:37 -06:00
Vincent Lee
14a7f6b14b
COrrect Crafty crate models
2016-01-09 21:01:50 -06:00
Vincent Lee
a6899a9f40
Special flower lighting crash
2016-01-09 19:31:58 -06:00
Vincent Lee
57398723a4
Cleanup
2016-01-09 19:05:37 -06:00
Vincent Lee
4345bd9728
More blockstate guards in TE and blockstate conversions
2016-01-09 19:01:31 -06:00
Vincent Lee
1c14dcf8ff
Fix pylon crash
2016-01-09 18:37:12 -06:00
Vincent Lee
7615d0b893
Fix recipes for 1.9 purpur not being registered
2016-01-09 17:49:59 -06:00
Vasco Lavos
b7975401b3
Merge pull request #1727 from yrsegal/master
...
Make CanFit (IFlowerComponent) affect items fitting into petal apothecary
2016-01-09 22:36:57 +00:00
yrsegal
f641e165b0
actually call canFit
2016-01-09 17:35:14 -05:00
Vincent Lee
568ed80ede
Allow platform to render other smart models
2016-01-09 00:03:04 -06:00
Vincent Lee
c3dce97e0d
Fix pylon and pool rendering in multiblock. Closes #25
2016-01-08 23:03:30 -06:00
Vincent Lee
61b8616008
Fix double flowers not dropping from both halves. Closes #24
2016-01-08 20:34:55 -06:00
Vincent Lee
f61d47f2dc
Some cleanup, fix wand of the forest minor bugs. Closes #22
2016-01-08 19:53:28 -06:00
Vincent Lee
9e16c4490b
Rename RenderEventHandler, restore flugel tiara extra renders, and fix sparkles renderirng too low. Closes #21
2016-01-08 19:10:28 -06:00
Vincent Lee
b4df8ce418
Full platform models. Fix bore lens crash and add copyleft headers to some things
2016-01-08 18:47:31 -06:00
Jonathan Smith
7e5974cd7c
Merge pull request #1721 from AlterAkima/patch-2
...
Brew related pages
2016-01-08 21:33:08 +00:00
Vincent Lee
84d0c75605
Fix lighting, AO is still broken
2016-01-08 14:56:16 -06:00
Vincent Lee
9c3a042089
pool tesr now uses baked model
2016-01-08 14:14:17 -06:00
Vincent Lee
a1aa50b532
Merge upstream release 248
2016-01-08 12:34:51 -06:00
Vincent Lee
972943a9ac
Updates to internal handler and icons
2016-01-08 12:33:49 -06:00
Vasco Lavos
6374b01762
Build 248
2016-01-08 18:22:07 +00:00
Vincent Lee
a4a77fb20f
Merge upstream
2016-01-08 12:00:01 -06:00
Vincent Lee
3a54166954
Revert "Tentatively change relics to use UUID. Still use playernames for display" due to a better solution being merged upstream.
...
This reverts commit 0687f56c32 .
2016-01-08 11:29:03 -06:00
Patric Alexandre
753a03b291
Brew relataded pages
2016-01-08 14:04:34 -03:00
Vasco Lavos
bf55ee4a60
Fixed the Hopperhock calling inventory methods on the client side, and thus, crashing when used alongside a BetterStorage Crate.
2016-01-08 14:41:05 +00:00
Vasco Lavos
68ea0b213e
Fixed alternate grass types not breaking faster with a shovel and not being able to sustain sugar cane. Closes #1711
2016-01-08 14:35:06 +00:00
Vasco Lavos
6b66163958
Fixed the Ring of Odin Fire Resistance config not changing its extinguish behaviour.
2016-01-08 14:32:29 +00:00
Vasco Lavos
c8517f565b
Fixed Mana Flashes not having a lexicon binding. Closes #1719
2016-01-08 14:30:55 +00:00
Vasco Lavos
8268c79353
New name
2016-01-08 14:27:53 +00:00
Vasco Lavos
c00bb80529
Merge pull request #1712 from Lazersmoke/18-oredictstonefix
...
Add oredict support 1.8 stone recipes, closes #1660
2016-01-08 14:22:48 +00:00
Vincent Lee
cd77b41d31
Incense plate converted to json
2016-01-07 21:19:39 -06:00
Vincent Lee
20b5743221
Safety guards for blockstates, remove all useless casts
2016-01-07 19:55:54 -06:00
Vincent Lee
e58eb1b345
Fix alfportal derp
2016-01-07 17:03:28 -06:00
Vincent Lee
064fd20edb
Mana flash and water bowl items
2016-01-07 16:56:03 -06:00
Vincent Lee
85102dea89
Mana inkwell item model. Pylon models fully working
2016-01-07 14:32:38 -06:00
Vincent Lee
baf14c361b
Fix third person render
2016-01-07 11:59:22 -06:00
Vincent Lee
3b7d7628cf
Derp
2016-01-07 11:46:36 -06:00
Vincent Lee
8155dc3059
Life imbuer model complete
2016-01-07 11:35:41 -06:00
Vincent Lee
0494c0eba2
Generify stuff, fix gaia head render, hourglass inventory model
2016-01-07 10:32:51 -06:00
Vincent Lee
12dfecb8ac
Add a bunch of dirty, dirty tesr item hook items. Also fix fabulous mana pool leaking its fabulousness
2016-01-07 08:52:58 -06:00
Vincent Lee
92aaa9f70a
Spreader turntable model
2016-01-06 21:40:18 -06:00
Vincent Lee
929860f8fa
Partial claw model. Fix cell block being a debug floating island. Fix a pure daisy oredict bug by checking for drops instead of state
2016-01-06 20:56:25 -06:00
Vincent Lee
383cd059cc
Fix hourglass having inverted redstone power. How come no one caught this?!
2016-01-06 20:16:22 -06:00
Vasco Lavos
b108af404f
Update contributors.properties
2016-01-06 22:23:28 +00:00
Jonathan Smith
d7f94bfc00
Merge pull request #1715 from yrsegal/master
...
Make the render color for camo blocks work with meta
2016-01-05 16:30:26 +00:00
yrsegal
69eac1f12e
Make the render color for camo blocks work with meta
...
before, blocks which required meta colors for determining their render
color would use the meta of the Platform itself
2016-01-04 19:39:50 -05:00
Jonathan Smith
0cd4722c1c
Merge pull request #1710 from Lazersmoke/pane-lighting
...
Added light to all panes, closing #1697
2016-01-04 10:14:52 +00:00
Jonathan Smith
e89322083d
Merge pull request #1713 from Lazersmoke/lens-recipe-fix
...
Fixes mana lens dyeing, closing #1708
2016-01-04 10:14:21 +00:00
Sam Quinn
f9ce3676e1
Fixes mana lens dyeing, closing #1708
...
Fixes having extra items beyond a dye and a lens messing everything up
2016-01-02 22:48:51 -06:00
Sam Quinn
17ddae20af
Add oredict support 1.8 stone recipes, closes #1660
...
the code was copy-pastaed from the addStairsAndSlabs helper function to
hack in oredict support, feel free to just add it to the helper function
if you want though. Looking at other Botania code, this is what comes to
mind though.
see #1703
There is also a very big problem that I marked with a comment that says
"very big problem", where on many many different stone types (end,
metamorph, 1.8) the recipe for stone bricks and for chisled is the same,
so usually you can't craft chisled.
sorry for long commit message
2016-01-02 21:38:26 -06:00
Sam Quinn
124f8bb173
Added light to all panes, closing #1697
...
All the full glass blocks had lightning, so now these can too!
2016-01-02 20:14:44 -06:00
Vasco Lavos
820c042f40
Update contributors.properties
2016-01-02 23:42:17 +00:00
Vasco Lavos
0f9bc9fc53
Merge pull request #1706 from Lazersmoke/patch-7
...
Removed references to Excaliber
2016-01-01 16:43:58 +00:00
Sam Quinn
9036e24365
Removed references to Excaliber
...
The Excalibru doesn't even exist anymore, so it doesn't make sense to talk about it in contributing, as you should be working with latest version anyway
2016-01-01 09:52:51 -06:00
Katrix-
d1c309f8ae
UUID for relics
...
Maybe better name for a few uuid methods?
2015-12-27 03:44:40 +01:00