Vincent Lee
9b06371a4e
Fix dirt path and spreader binding. Closes #279
2016-05-18 11:31:12 -05:00
Vincent Lee
afb3f6f44b
Fix lexicon model i accidentally broke
2016-05-18 11:22:13 -05:00
Vincent Lee
1deb617f72
Fix GOG sound #285
2016-05-18 11:13:38 -05:00
Vincent Lee
b1fad332b8
Fix terraaxe icon when inactive, closes #281
2016-05-15 21:51:24 -05:00
Vincent Lee
df478b0ff8
Fix picking root block giving bad item. Closes #282
2016-05-15 21:25:54 -05:00
Vincent Lee
68560a335e
Minor cleanup
2016-05-13 22:47:18 -05:00
Vincent Lee
13905a174c
Fix smoke particles
2016-05-13 00:08:35 -05:00
Vincent Lee
ef0f31f2de
Some probably useless optimizations
2016-05-12 20:02:57 -05:00
Vincent Lee
1d7a402c6e
Optimize itemfinder heavily
2016-05-12 19:45:51 -05:00
Vincent Lee
b0fad5db16
Fix hopperhock being broken with vanilla chests
2016-05-12 17:51:58 -05:00
Vincent Lee
481eb5e711
Serverside many subtiles
2016-05-12 17:38:25 -05:00
Vincent Lee
1e26be3c77
Weaken boss collection
2016-05-12 16:30:01 -05:00
Vincent Lee
a2d8aa17d2
Fix petal burying #274
2016-05-12 14:47:29 -05:00
Vincent Lee
ebc6f1a8c6
Loonium now can be set to a custom loot table. For mapmakers
2016-05-11 19:27:15 -05:00
Vincent Lee
6a5e37b632
Update forge, fully fix loot generation
2016-05-11 11:50:06 -05:00
Vincent Lee
6b55f97a44
Build 304
2016-05-10 23:24:27 -05:00
Vincent Lee
ae71a4756c
I messed that up >.>. Fix server crash on startup #272
2016-05-10 23:21:38 -05:00
Vincent Lee
bf0712a75c
Build 302
2016-05-10 23:18:46 -05:00
Vincent Lee
79e2ee7c0a
Shim in loot table to suppress errors in public build
2016-05-10 19:54:09 -05:00
Vincent Lee
fb7fda6996
Update versionchecker links
2016-05-10 19:39:02 -05:00
Vincent Lee
c944512519
Fix pump rendering, pool cart rendering. Made pool cart spawn particles
2016-05-10 19:11:18 -05:00
Vincent Lee
dc8104f68b
Preliminary work on new loot system
2016-05-10 11:55:50 -05:00
Vincent Lee
46417330a4
Fix #266 log spam
2016-05-07 22:32:09 -05:00
Vincent Lee
2f292ed3be
Fix #271 incense rendering
2016-05-07 22:29:46 -05:00
Vincent Lee
4231dc839f
Add reverse petal block recipes
2016-05-07 11:56:57 -05:00
Vincent Lee
be1eb570ef
More minor cleaning
2016-05-06 23:50:00 -05:00
Vincent Lee
d524a0b2e9
Fold a couple interfaces together, we have way too many .-.
2016-05-06 23:39:33 -05:00
Vincent Lee
afc5f93b55
Fix #265
2016-05-06 22:38:07 -05:00
Vincent Lee
072f13d3db
Update JEI and add support for recipe category crafting items
2016-05-06 22:24:15 -05:00
Vincent Lee
5e11fe6e06
Removed model registration for last commit
2016-05-06 19:34:33 -05:00
Vincent Lee
a3abfb6aad
Removed buried petals and mana flash item forms. Closes #268
2016-05-06 19:30:58 -05:00
Vincent Lee
c0c1db1aa7
Fix #267
2016-05-06 19:11:33 -05:00
Vincent Lee
e99d5dff63
Update to recommended forge, removed useless synchronization in ManaNetworkHandler
2016-05-06 18:49:11 -05:00
Vincent Lee
1b144e6b58
Fix #264
2016-05-04 19:32:33 -05:00
Vincent Lee
7dcd0281b8
Actually commit new zip
2016-05-04 18:58:15 -05:00
Vincent Lee
2d412ac70f
Various cleanups, updated alt textures to 1.9
2016-05-04 18:38:09 -05:00
Vincent Lee
a0d251fafd
Update forge and close #245
2016-05-03 12:38:52 -05:00
Vincent Lee
f24409f336
Add workarounds for the silly forge light bug. Closes #221 , probably closes #251 as well
2016-05-03 11:31:59 -05:00
Vincent Lee
7a66a9756b
Revert stupid find replace hit
2016-05-02 22:08:10 -05:00
Vincent Lee
a802650289
Merge branch 'derpbranch' into MC19
2016-05-02 22:06:29 -05:00
Vincent Lee
130c67e758
Fully serverside gaia guardian, buff it a bit
2016-05-02 22:05:35 -05:00
Vincent Lee
d0e2f474bc
Resync hourglass whenever it flips, hopefully helps with desyncs
2016-05-02 20:14:46 -05:00
Vincent Lee
6889afc34e
Delete old models
2016-05-02 19:59:08 -05:00
Vincent Lee
bb152907a7
Fix TESR item transforms
2016-05-02 19:45:30 -05:00
Vincent Lee
3996c5d078
Guard against null chunk in packethandler
2016-05-02 19:24:13 -05:00
Vincent Lee
8f4f63453a
Move nonfabulous pools into static renderer. Yay performance improvements!
2016-05-02 19:20:31 -05:00
Vincent Lee
725ae1cef1
Fix crystal cube, closes #253
2016-05-02 08:34:30 -05:00
Vincent Lee
93656a9d43
Fix+tweak paint lens particles
2016-05-01 22:43:33 -05:00
Vincent Lee
96a1db97a9
Serverside TilePool
2016-05-01 22:03:58 -05:00
Vincent Lee
a339397fcc
Some network boilerplate
2016-05-01 21:25:30 -05:00
Vincent Lee
e37255a997
Make platform disappear with managlass, and fix version checker
2016-05-01 11:42:40 -05:00
Vincent Lee
95427b1c9d
Fix missing texture on fungal apothecary
2016-04-30 14:03:09 -05:00
Vincent Lee
4a6bf0ed0d
Fix incorrect horn sound. Closes #257
2016-04-30 13:26:05 -05:00
Vincent Lee
b6827ca04e
Remove new cooldown from signal flare, remove redundant check from fire/rainbowrod
2016-04-29 08:15:54 -05:00
Vincent Lee
45df392cce
Close #259
2016-04-28 23:37:20 -05:00
Vincent Lee
abf5d9672b
Make some items use new cooldowns, closes #261
2016-04-28 23:34:40 -05:00
Vincent Lee
dc35d395cf
Some balance changes
2016-04-27 19:26:56 -05:00
Vincent Lee
fca4e2bfa8
Properly check kekimurus. Closes #255
2016-04-27 17:23:00 -05:00
Vincent Lee
543b5a1958
Guard against null item stacks in OD -.-. Closes #254
2016-04-27 17:20:18 -05:00
Vincent Lee
f8d18ae769
All other sound subtitles
2016-04-23 22:03:27 -05:00
Vincent Lee
6d350451fc
Some sound subtitles
2016-04-23 21:05:11 -05:00
Vincent Lee
5d1829a00e
Camo block now respects directional blocks. Closes #110
2016-04-23 18:44:32 -05:00
Vincent Lee
16f6289844
Fix dupe dropping with psi. Closes #250
2016-04-23 16:02:02 -05:00
Vincent Lee
be155e0abb
Tweak lexicon hud, closes #241
2016-04-20 19:47:48 -05:00
Vincent Lee
2ad607bff3
Show all buffs on first row
2016-04-20 19:39:24 -05:00
Wire Segal
b090622477
Add a ManaUpgradeRecipe. ( #218 )
...
third pr for recipes, yay
2016-04-17 22:07:41 -05:00
Vincent Lee
af5e9f7751
Fix grisaia crash. Closes #242
2016-04-17 21:28:27 -05:00
Vincent Lee
b32f834a73
Go back to meta for now, should close #183
2016-04-17 20:53:12 -05:00
Vincent Lee
d34e3453fe
Fix bow not being able to fire, Closes #238
2016-04-17 20:49:27 -05:00
Vincent Lee
5d5109d6d1
Fix some items not being colored. Closes #240
2016-04-17 20:41:51 -05:00
Vincent Lee
a838427df8
Finalized migration mechanisms
2016-04-17 20:32:17 -05:00
Vincent Lee
55262cd4e5
Update nag message, add migration recipes for everything
2016-04-17 20:03:31 -05:00
Vincent Lee
de0ba4ada9
Revert "Upload remapping code for troubleshooting"
...
This reverts commit 9309355af2 .
2016-04-17 12:00:49 -05:00
Vincent Lee
5bf1c26ffb
Make some conditionals smarter
2016-04-17 00:35:09 -05:00
Vincent Lee
dd300ea32f
Convert gaia guardian to loot tables and fix gg music
2016-04-17 00:31:47 -05:00
Vincent Lee
905a372708
Add remap for full slabs
2016-04-15 20:06:44 -05:00
Vincent Lee
9309355af2
Upload remapping code for troubleshooting
2016-04-15 19:24:36 -05:00
Vincent Lee
910dfc25db
Fix derp
2016-04-15 10:17:39 -05:00
Vincent Lee
0ad2a4f218
Fix boss bar rendering, music still not playing
2016-04-15 10:16:46 -05:00
Vincent Lee
b479284760
Fix throwables
2016-04-14 23:00:55 -05:00
Vincent Lee
0a396b0d82
Full optimize imports
2016-04-14 22:49:49 -05:00
Vincent Lee
3f85ca5805
Remove isFull3D as it's no longer used for anything
2016-04-14 22:45:31 -05:00
Vincent Lee
9f60ac59fa
Remove old flugel code. This is what git is for :P
2016-04-14 22:42:46 -05:00
Vincent Lee
f01b8a1fa9
Prevent paint lens from painting blocks illegal colors
2016-04-14 22:39:26 -05:00
Vincent Lee
8c3d1bde14
Tweak equip sounds, boost thundercaller's attack speed
2016-04-14 22:37:26 -05:00
Vincent Lee
a782017852
Remove old remappers
2016-04-14 22:21:55 -05:00
Vincent Lee
b9fcf9bd53
Modernize ice pendant. Now acts like frost walker VIII and doesn't require player to be touching ground
2016-04-14 22:18:37 -05:00
Vincent Lee
391eea0416
Minor optimization in jaded ama, closes #186 kinda maybe
2016-04-14 22:05:09 -05:00
Vincent Lee
a4279647fa
Tweak previous pr
2016-04-14 22:02:40 -05:00
Wire Segal
9e82e5357a
Armor keeps enchantments when crafted ( #213 )
...
* Armor keeps enchantments when crafted
Closes #209
* Copy runic shielding as well
2016-04-14 21:59:36 -05:00
Vincent Lee
d33590f7ca
Fix bounding box issue causing bindings to fail. Closes #234
2016-04-14 21:39:43 -05:00
Vincent Lee
45dda5f19c
Fix vine balls and tweak slightly
2016-04-14 00:23:29 -05:00
Vincent Lee
be9fba512b
Fix stair json weirdness
2016-04-13 17:30:26 -05:00
Vincent Lee
f219836f81
update canBlockRenderInLayer
2016-04-13 16:20:38 -05:00
Vincent Lee
2c75af2359
Build 301
2016-04-13 10:09:30 -05:00
Vincent Lee
86b6962f94
Minor optimization in MathHelper, cleanup for rel
2016-04-13 09:57:17 -05:00
Vincent Lee
26831d3e98
Tweaks to heisei dream inner workings
2016-04-13 09:48:29 -05:00
Vincent Lee
a6c2631946
Cleanup prev commit
2016-04-12 13:47:18 -05:00
Vincent Lee
7a36e543ad
Experiemntally convert mana network to using sets
2016-04-12 12:28:58 -05:00
Vincent Lee
649dffcf71
Moar cleanups!
2016-04-12 01:32:49 -05:00
Vincent Lee
b3ee6dcf7a
More cleanup, brews now average their potion colors instead picking the first
2016-04-12 00:51:09 -05:00
Vincent Lee
69cbecb521
More cleanup, Full pool for JEI handlers
2016-04-11 23:22:02 -05:00
Vincent Lee
effd07129c
A round of FindBugs, and fix red interceptor not working at all
2016-04-11 22:47:24 -05:00
Vincent Lee
e73feae688
Tweak horse inv dropping again
2016-04-11 21:44:30 -05:00
Vincent Lee
cee7a965a5
Tweak horse inv dropping
2016-04-11 21:17:42 -05:00
Vincent Lee
07f3099071
Force relay tweaks, hopefully resolves #232
2016-04-11 20:55:11 -05:00
Vincent Lee
70cc32a839
Add RenderFull NBT tag override to pools. Closes #228
2016-04-11 20:18:41 -05:00
Vincent Lee
50eeb06bf6
Remove useless line. Make horse drop all items when being virused, closes #189
2016-04-11 19:43:18 -05:00
Vincent Lee
d97b2ceb1d
Fix pool's north wall being slightly taller, Fix pump item model
2016-04-09 22:43:50 -05:00
Vincent Lee
209970b60c
Fix bauble box gui. Closes #185
2016-04-09 21:37:41 -05:00
Vincent Lee
5cdf48393a
Fix top half of double flowers not sparkling with correct color. Also disable random offsetting because it's broken
2016-04-09 21:25:41 -05:00
Vincent Lee
533a287bd3
Allow vanilla flowers to be ground directly into powder. Closes #215
2016-04-09 21:03:51 -05:00
Vincent Lee
7c61b1b9d3
Misc cleanup, fix hud catalyst, test gpg sign
2016-04-09 20:26:04 -05:00
Vincent Lee
4a9c269a67
Clean up terra firma rod code
2016-04-08 13:24:44 -05:00
Vincent Lee
1a7e128ae5
Merge pull request #224 from yrsegal/19FixTerraformRod
...
Fix the Rod of the Terra Firma not working
2016-04-08 12:59:00 -05:00
Vincent Lee
be09676053
Use ==
2016-04-08 12:37:13 -05:00
Vincent Lee
11d327dcce
Merge branch 'MC19' of github.com:williewillus/Botania into MC19
2016-04-08 12:32:59 -05:00
Vincent Lee
5df661bf28
Merge pull request #227 from yrsegal/Catalysts
...
Catalysts can accept any catalyst BlockState.
2016-04-08 12:32:41 -05:00
yrsegal
fa8c12d6fc
Catalysts can accept any catalyst BlockState.
...
This constitutes a major, but not breaking, API update. All catalyst
methods previously in RecipeManaInfusion have been deprecated.
2016-04-07 21:50:28 -04:00
yrsegal
39a44642e4
Fix the Rod of the Terra Firma not working
...
Closes #191
2016-04-06 18:58:39 -04:00
Vincent Lee
bcecfb9148
Merge pull request #222 from yrsegal/19FixMunchdew
...
Fix munchdew not working
2016-04-06 17:43:06 -05:00
yrsegal
1f11359b23
Fix munchdew not working
...
Closes #220
2016-04-06 18:14:07 -04:00
Vincent Lee
4ec22a0417
Merge upstream
2016-04-06 09:51:50 -05:00
Vincent Lee
8a6189cbd2
Fix mana tablet rendering
2016-04-06 09:48:28 -05:00
Vincent Lee
796d231867
Fix wall digging textures
2016-04-05 13:20:37 -05:00
Vincent Lee
fb0a414443
Rename build to fix stupid issues
2016-04-05 08:51:10 -05:00
Vincent Lee
ae57ace7e8
Fix spreader item model, misc fixes, update forge to 1841 so all interact events are back
2016-04-04 21:03:12 -05:00
Vincent Lee
f011be3571
Switch last commit to shaders. Thanks PaleoCrafter!
2016-04-04 13:32:36 -05:00
Vincent Lee
109d045a4d
Fix ugly multiblock rendering
2016-04-04 13:09:02 -05:00
Vincent Lee
32fb1bcf6d
Fix contributor renders. Closes #200
2016-04-04 09:47:02 -05:00
Vincent Lee
529c41407f
Allow mana guns to be dual wielded
2016-04-04 09:30:52 -05:00
Vincent Lee
ea6484211b
API cleanups
2016-04-03 23:26:20 -05:00
Vincent Lee
53ce019cf5
Various misc cleanups
2016-04-03 23:07:24 -05:00
Vincent Lee
eec7c8ba59
Fix missing center model for panes. Closes #208
2016-04-03 21:25:55 -05:00
Vincent Lee
c07febc67d
Merge branch 'MC19' of github.com:williewillus/Botania into MC19
2016-04-03 21:23:18 -05:00
Vincent Lee
08550cc442
Cleanup
2016-04-03 21:23:04 -05:00
Vincent Lee
82fa306a5c
Merge pull request #207 from yrsegal/19Patch
...
Fix invalid color combination
2016-04-03 21:03:21 -05:00
yrsegal
63a5bdee1c
Fix invalid color combination
2016-04-03 21:54:36 -04:00
Vincent Lee
f8157f1222
Fix erratic colorization of bursts and flashes
...
Fix erratic colorization of bursts and flashes
2016-04-03 20:50:14 -05:00
yrsegal
7536ebe4c6
Fix erratic colorization of bursts and flashes
...
closes #198
2016-04-03 21:38:42 -04:00
Vincent Lee
af19c7cece
Update kekimurus for extra slice of cake in 1.8
2016-04-03 20:23:05 -05:00
Vincent Lee
43395f9441
Fix walls appearing in vanilla creative tab. Closes #190
2016-04-03 20:08:58 -05:00
Vincent Lee
97495a913d
Cleanup walls
2016-04-03 19:59:58 -05:00
Vincent Lee
1d901ec9ac
Fix panes. Closes #204
2016-04-03 19:39:05 -05:00
Vincent Lee
62b39ee682
Fix crash serverside. Closes #197
2016-04-03 19:00:20 -05:00
Vincent Lee
759bf2835d
Merge branch 'MC19' of github.com:williewillus/Botania into MC19
2016-04-03 18:47:57 -05:00
Vincent Lee
69db133091
Update forge
2016-04-03 18:47:31 -05:00
Wire Segal
5ceceec6bb
Various minor fixes
...
* Fix Lexicon crashing with invalid version format
Closes #192
* Fix crashing on damage taken
Closes #196
* Fix attributes being too present/wrong values
Closes #194
2016-04-03 17:01:24 -05:00
Vincent Lee
5f3172bd5d
Cleanup, fix soulscribe holding
2016-04-01 16:51:30 -05:00
Vincent Lee
79c8e3d695
various miscellaneous fixes
2016-03-31 01:09:46 -05:00
Vincent Lee
f5b435bf24
Model cleanup
2016-03-30 23:26:06 -05:00
Vincent Lee
b6d607b553
Bow tweaks
2016-03-27 14:07:27 -05:00
Vincent Lee
d411fac65c
Half fix floating flowers
2016-03-27 13:35:12 -05:00
Vincent Lee
9bc724d6fd
Fix flower models
2016-03-27 12:45:48 -05:00
Vincent Lee
bcd00dbba3
Update JEI, more overrides
2016-03-27 12:05:19 -05:00
Vincent Lee
c8531fde67
Update forge, some more model overrides
2016-03-27 00:30:45 -05:00
Vincent Lee
4771ec5bdb
Some item overrides, fix bow firing
2016-03-24 14:41:10 -05:00
Vincent Lee
ecb0f8a4be
Fix bow models
2016-03-24 13:47:58 -05:00
Vincent Lee
ab618923df
Fix some methodhandles
2016-03-24 13:01:07 -05:00
Vincent Lee
674ba5c19d
Fix somde models
2016-03-24 12:30:14 -05:00
Vincent Lee
1b87160ef6
Register the potions
2016-03-24 09:45:56 -05:00
Vincent Lee
ec419edfe3
Fix sounds
2016-03-24 09:13:15 -05:00
Vincent Lee
5b9a5bf480
Update most reflection names
2016-03-24 00:02:36 -05:00
Vincent Lee
1b79575648
Fix other models
2016-03-23 23:47:06 -05:00
Vincent Lee
0ba32450cf
Fix stairs
2016-03-23 23:31:08 -05:00
Vincent Lee
400f6583ad
Fix item models
2016-03-23 23:10:22 -05:00
Vincent Lee
365bed04c0
Flowers not working
2016-03-23 22:10:38 -05:00
Vincent Lee
3e79893a35
Barely runs
2016-03-23 21:34:19 -05:00
Vincent Lee
d37518c9f4
Compiles. Update JEI.
2016-03-19 15:58:12 -05:00
Vincent Lee
0af2d25a71
Misc fixes, fix baked models
2016-03-19 11:38:16 -05:00
Vincent Lee
268a8afda5
Most TE's
2016-03-19 09:59:45 -05:00
Vincent Lee
5cc6879ecb
Lots of blocks
2016-03-18 23:08:49 -05:00
Vincent Lee
a268149d73
Misc rendering
2016-03-18 20:42:43 -05:00
Vincent Lee
fe16702db4
Brews and potions
2016-03-18 20:26:53 -05:00
Vincent Lee
c23b9dcaee
Some blocks
2016-03-18 20:20:23 -05:00
Vincent Lee
663c797cf3
More items
2016-03-18 20:01:50 -05:00
Vincent Lee
3852282598
Missed two
2016-03-18 19:03:35 -05:00
Vincent Lee
3dd877e69a
Color handling
2016-03-18 18:59:23 -05:00
Vincent Lee
1c608d4636
A lot of items. Rods, and lenses.
2016-03-18 16:51:21 -05:00
Vincent Lee
cfbf2cc538
Entities
2016-03-18 14:47:38 -05:00
Vincent Lee
017829927f
Some blocks
2016-03-18 13:26:42 -05:00
Vincent Lee
644d6553d1
Large amounts of stuff in client
2016-03-18 13:17:33 -05:00
Vincent Lee
58e06ae86b
Most of API
2016-03-18 12:30:10 -05:00
Vincent Lee
3bb203e371
More rename substitutions
2016-03-18 11:07:42 -05:00
Vincent Lee
5821ede5e6
Lots of name substitutions
2016-03-18 10:42:42 -05:00
Vincent Lee
316363d729
Remove redundant check on jaded amaranthus
2016-03-18 00:02:40 -05:00
Vincent Lee
6622ec5270
Removeold potion handlers
2016-03-16 22:54:47 -05:00
Vincent Lee
f86f42b895
Fix infinite potion spam with sponge
2016-03-14 15:40:49 -05:00
Vincent Lee
b9b7a4e07d
Finish waterbowl fancification
2016-03-14 13:37:10 -05:00
Vincent Lee
199243c120
waterbowl fancification attempt
2016-03-14 12:46:29 -05:00
Vincent Lee
4b056375d4
Fix pump trying to animate serverside. Closes #181
2016-03-13 12:30:12 -05:00
Vincent Lee
8e550e36d2
Revert "Fix particles being culled at render distance. Closes #15 "
...
This reverts commit 9a756ef79e .
2016-03-13 12:26:21 -05:00
Vincent Lee
9a756ef79e
Fix particles being culled at render distance. Closes #15
2016-03-12 21:12:09 -06:00
Vincent Lee
bead93c653
Minor memory optimization, fix JEI integration for magical flowers
2016-03-12 20:48:48 -06:00
Vincent Lee
e2596f4511
Fix red string comparator not binding, closes #179
2016-03-12 20:39:07 -06:00
Vincent Lee
ec1cc498ce
Build 299
2016-03-12 20:38:49 -06:00
Vincent Lee
8f67094377
Tweak nag and version checker
2016-03-12 16:50:28 -06:00
Vincent Lee
2172d78dd2
Disable the background downloader for now, at least til we get a file server
2016-03-12 16:36:44 -06:00
Vincent Lee
099c02157e
Update buildscript and update checker
2016-03-12 16:26:59 -06:00
Vincent Lee
3cc7099ab2
Fix itemfinder crash. Closes #176
2016-03-12 14:48:45 -06:00
Vincent Lee
f1403a4577
Fix terra pick mass harvesting. closes #175
2016-03-12 13:27:47 -06:00
Vincent Lee
64e1282444
Done!
2016-03-12 00:59:11 -06:00
Vincent Lee
949fdde057
Made the old model not render in 1p
2016-03-12 00:51:34 -06:00
Vincent Lee
e031b3b52c
In working state
2016-03-12 00:23:51 -06:00
Vincent Lee
55c2a522ee
Preliminary 3d lexicon
2016-03-11 23:22:38 -06:00
Vincent Lee
cf7f10d082
Fix the pump textures
2016-03-11 22:02:45 -06:00
Vincent Lee
8909b26e99
Update buildscript
2016-03-11 16:04:31 -06:00
Vincent Lee
3534a6cc5f
Close #174
2016-03-11 13:14:42 -06:00
Vincent Lee
95f8cc529f
Fix dark quartz slab model
2016-03-11 09:38:08 -06:00
Vincent Lee
4c1b15b336
nullcheck spark item. Closes #173
2016-03-09 20:50:58 -06:00
Vincent Lee
4bad74dbfd
Workaround for a jei integration problem, closes #172
2016-03-09 20:27:55 -06:00
Vincent Lee
f5b71f9db1
Possible fixes for #171
2016-03-09 15:44:14 -06:00
Vincent Lee
769528ceed
Fix prism not resyncing when being automated
2016-03-09 09:56:30 -06:00
Vincent Lee
84e38b5a32
Fix nonssmooth turntable animation. Closes #169
2016-03-09 09:35:45 -06:00
Vincent Lee
3a9f0b346e
Fix inverted redstone conditions in prism. Closes #167
2016-03-08 22:44:31 -06:00
Vincent Lee
3097dde357
Restore storage drawers compat, closes #166
2016-03-08 10:57:19 -06:00
Vincent Lee
e25cf207a6
Let rabbits spawn from cocoon of cparice
2016-03-07 20:46:05 -06:00
Vincent Lee
c74e77d9fc
Fix corporea index stars being too bright
2016-03-07 20:44:22 -06:00
Vincent Lee
c105b606c4
Moar capability fixes. Closes #165
2016-03-07 20:26:52 -06:00
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
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
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
GirafiStudios
ba944db343
Updated to official RF API.
2016-02-10 20:33:21 +01: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
Vincent Lee
b8e06a3d36
update readme
2016-02-03 16:59:00 -06: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
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
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
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
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
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
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
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
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
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
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
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
Vincent Lee
b01e9dfed7
Staging changes would be a good idea. Also fix possible potion crash
2016-01-13 17:14:12 -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
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
Vincent Lee
d8a74e2e44
Trying to render AO pool
2016-01-11 20:06:59 -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
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
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
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
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
Vincent Lee
2ddf71d76f
Cleanup
2016-01-05 21:41:07 -06:00
Vincent Lee
34fae04641
Made API dediserver-safe. Remove icon methods from SubTileSignature.
2016-01-05 21:39:56 -06:00
Vincent Lee
dc6af948d9
Don't use a sideonly client method. Closes #18
2016-01-05 21:23:50 -06:00
Vincent Lee
3fe2a0006c
Change crystal bow draw animation to better reflect when it's fully charged
2016-01-05 19:51:41 -06:00
Vincent Lee
89dac440c8
Change starfield item model to match upstream
2016-01-05 19:27:54 -06:00
Vincent Lee
5797d18d9b
Fix a bunch of coloring mistakes. Fix flower particles because I'm dumb
2016-01-05 19:24:30 -06:00
Vincent Lee
52cf3df27e
Fix tessellator bugs, fix alf portal crash
2016-01-05 17:15:22 -06:00
Vincent Lee
b976ed5df1
Cleanup JEI integration, add copyleft.
2016-01-05 17:01:46 -06:00
Vincent Lee
e727cb7f2b
Merge branch 'jei' into MC18
2016-01-05 16:51:18 -06:00
Vincent Lee
8e6dc7c637
JEI integration complete (runic altar, mana infusion)
2016-01-05 16:51:03 -06:00
Vincent Lee
28249d1e33
Elven trade integration
2016-01-05 15:36:10 -06:00
Vincent Lee
b24585b13d
Update a bunch of recipes to take vanilla blocks and items. Also remove prismarine lex entry and move infusion recipe to mana pool page.
2016-01-05 12:25:53 -06:00
Vincent Lee
86880bfd49
Fix helmet of revealing inv model
2016-01-05 00:05:09 -06:00
Vincent Lee
c8c50f9af0
Future is now part 1: conversions recipes to vanilla
2016-01-04 23:29:50 -06:00
Vincent Lee
0e301a4e33
Fix apothecary light level crash, tiny potato render crash. Closes #17
2016-01-04 22:47:47 -06:00
Vincent Lee
10d095d656
Finish pure daisy integration
2016-01-04 22:46:24 -06:00
Vincent Lee
9bf2e0c555
Semi working petal apothecary itnegration
2016-01-04 22:34:45 -06:00
Vincent Lee
95118696ce
Half complete petal apothecary
2016-01-04 20:57:14 -06:00
Vincent Lee
ab4f6f6433
workaround for pylon enchant power. closes #16
2016-01-04 19:58:54 -06:00
Vincent Lee
46c13be698
Fix rotations and nameplates for tiny potato
2016-01-04 14:09:18 -06:00
Vincent Lee
ad58fb1855
Partial tiny potato
2016-01-04 12:18:19 -06:00
Vincent Lee
12ae7ed3d1
Fix thaumcraft integration crashing
2016-01-04 10:01:04 -06:00
Vincent Lee
6cf82eb98d
Rudimentary pure daisy integration
2016-01-03 23:43:24 -06:00
Vincent Lee
b10a642297
Brewery recipe support
2016-01-03 22:02:02 -06:00
Vincent Lee
75ab210227
Item models fully working. TESRs may be changed in future
2016-01-03 19:59:27 -06:00
Vincent Lee
0b27d9d0b5
Attempt at json pool model
2016-01-03 19:29:09 -06:00
Vincent Lee
3c102bbc75
Move mc dep ver out of @Mod
2016-01-02 23:32:55 -06:00
Vincent Lee
4e1065855e
Some formatting cleanups. Add copyleft header to all new classes
2016-01-02 23:21:55 -06:00
Vincent Lee
3eb67e3fea
Corporea index and cube item model
2016-01-02 19:43:41 -06:00
Vincent Lee
5d80b7d9ce
Fix thaumcraft 5 goggles of revealing integration. closes #14
2016-01-02 19:07:52 -06:00
Vincent Lee
f7e5054bf4
Fix armor rendering - thanks primetoxinz for the find!
2016-01-01 16:05:17 -06:00
Vincent Lee
906fb74ec0
Fix santaweave inv icons
2016-01-01 15:35:08 -06:00
Vincent Lee
48cf387682
Unssuccessful attempt to fix sky renderer leaking state. Mark for release
2015-12-31 14:28:13 -06:00
Vincent Lee
c54b85dfd5
Cacophonium block model
2015-12-31 13:34:09 -06:00
Vincent Lee
bd98879d49
Fix piston relays
2015-12-31 13:13:32 -06:00
Vincent Lee
b3a83031c1
Misc rendering fixes
2015-12-31 12:45:18 -06:00
Vincent Lee
c8d4c54ed7
Bandaid for one block off multiblock render
2015-12-30 23:47:16 -06:00
Vincent Lee
9ee02b55ad
Fix bifrost rod, gateway core and root model
2015-12-30 23:37:49 -06:00
Vincent Lee
2cc7e133cc
fluxfield model, fix pump crash, fix gaia render
2015-12-30 22:25:08 -06:00
Vincent Lee
0c062967a0
Mana Bomb, Mana Detector
2015-12-30 21:23:54 -06:00
Vincent Lee
1cf175d412
Baubles and stuff
2015-12-30 20:56:50 -06:00
Vincent Lee
5293f811c8
Fix king key weapon and item render
2015-12-30 19:34:14 -06:00
Vincent Lee
c5a5657810
Missed some >.> also a teeny bit of attribution that probably won't even show up because it runs off the screen
2015-12-30 18:33:56 -06:00
Vincent Lee
4dd62fae37
Corporea blocks, luminizers, comment out nei and cbmp stuff so it can actually build.
2015-12-30 18:27:06 -06:00
Vincent Lee
a67aeee496
SPark changer, terrasteel plate, fix spark entity render
2015-12-30 14:51:14 -06:00
Vincent Lee
c2470f80ee
Fixes so server works
2015-12-30 13:11:18 -06:00
Vincent Lee
b4300a9e3b
Corporea item icons (world render broken still). Temp fix for pylon multiblock rendering.
2015-12-30 00:55:21 -06:00
Vincent Lee
9f5455aa9f
Let it run on 1.8.8 as well.
2015-12-29 23:47:28 -06:00
Vincent Lee
37b5d00388
Update to 1.8.9, fix apothecary collision
2015-12-29 23:45:26 -06:00
Vincent Lee
1973779897
Petal apothecaries fully restored
2015-12-29 22:37:19 -06:00
Vincent Lee
71607ae3bd
Merge release build 246
2015-12-29 19:36:50 -06:00
Vincent Lee
965ab01889
Fix the textures
2015-12-29 14:56:19 -06:00
Vincent Lee
5a630fbf39
Done with floating flowers completely. Can't get the spinning right though.
2015-12-29 14:45:50 -06:00
Vincent Lee
3aef9efe8b
Floating flowers kinda sorta mostly working
2015-12-29 00:34:13 -06:00
Vincent Lee
8f70814ae6
Partially working floaters
2015-12-28 22:21:22 -06:00
Vincent Lee
43cd84d2cd
Fix multiblock rendering and enchanter activation bug
2015-12-28 19:11:20 -06:00
Vincent Lee
2f0915e18c
Lots more item models, red string block models
2015-12-28 17:50:33 -06:00
Vincent Lee
8eedaa5563
Fix texture errors, fix pool and apothecary collision detection
2015-12-28 16:11:01 -06:00
Vincent Lee
b701f197ee
Some progress on floating flowers
2015-12-28 14:17:10 -06:00
Vincent Lee
bf07f10ac7
Fix brewery rendering and operation
2015-12-27 22:38:26 -06:00
Vincent Lee
90fcc98bd0
Fix wisp particle
2015-12-27 20:33:24 -06:00
Vincent Lee
c513f17f88
All brews, mana tablet, mana gun, incense, and other items
2015-12-27 20:16:31 -06:00
Vincent Lee
e83d1600cf
Blood pendant, enchanted soil, enchanter, open bucket, prism, fix some rendering
2015-12-27 16:52:30 -06:00
Vincent Lee
5b1ac0368d
Quartz, prismarine, various items, fix upper slab uvlock
2015-12-27 15:39:45 -06:00
Vincent Lee
65837fbf38
Punt on apothecary. Items first
2015-12-27 12:52:02 -06:00
Vincent Lee
33a8d5e33c
Done with apothecaries for today >.>
2015-12-27 01:51:06 -06:00
Vincent Lee
b740a22684
Fix old tex, temporary json
2015-12-27 00:42:24 -06:00
Vincent Lee
7c41ffcaa1
Destitched model files
2015-12-27 00:26:41 -06:00
Vincent Lee
781f586d19
Upload some files so I can use modelcreator in windows >.>
2015-12-26 21:55:32 -06:00
Katrix-
d1c309f8ae
UUID for relics
...
Maybe better name for a few uuid methods?
2015-12-27 03:44:40 +01:00
Vincent Lee
794e1352e8
Lenses and lens rendering on spreader
2015-12-26 20:00:34 -06:00
Vincent Lee
f449fca882
Actually commit this time
2015-12-26 17:41:50 -06:00
Vincent Lee
73663e8a0a
Fix rod models, made runic altar and avatar render their items
2015-12-26 17:38:07 -06:00
Vincent Lee
86cd656360
Merge branch 'MC18' of github.com:williewillus/Botania into MC18
2015-12-26 16:27:00 -06:00
Vincent Lee
20b433af3c
Merge pull request #2 from primetoxinz/MC18
...
More Item Models :D
2015-12-26 16:22:09 -06:00
Vincent Lee
5fe696875f
More various models
2015-12-26 16:21:21 -06:00
primetoxinz
18dceeeb5f
fix for merge
2015-12-26 16:43:32 -05:00
Tyler
ccbf325a76
Merge pull request #2 from williewillus/MC18
...
Merge
2015-12-26 16:32:18 -05:00
Vincent Lee
2f4785c7b4
Clean up flower and mushroom jsons
2015-12-26 12:35:46 -06:00
Vincent Lee
e2ac5ecad1
Fix double flowers fully, a couple more models
2015-12-26 00:49:30 -06:00
Vincent Lee
8cda41cdb8
Finish walls, and ALL slabs. Made floating flowers render properly in world.
2015-12-25 22:44:10 -06:00
Vincent Lee
b36f51f6d8
Clean up a ton of models, add some walls
2015-12-24 22:00:24 -06:00
Vincent Lee
32fe7f6ce3
Fix landing and break particles in specail flowers
2015-12-24 15:05:52 -06:00
Vincent Lee
0687f56c32
Tentatively change relics to use UUID. Still use playernames for display
2015-12-24 14:42:52 -06:00
Vincent Lee
70d4450a6a
Wand of the Forest, Fel pumpkin, trodden path
2015-12-24 14:00:11 -06:00
Vincent Lee
dcd08963e9
Special item models
2015-12-24 12:33:25 -06:00
Vincent Lee
23cab39892
All special flowers. item model system not yet done
2015-12-24 11:05:00 -06:00
Vincent Lee
f4ea60ba2c
IT WORKS
2015-12-24 03:04:16 -06:00
Vincent Lee
319bab35a0
Lay all groundwork for special flower models. Not yet tested.
2015-12-24 02:14:21 -06:00
Vincent Lee
d58f153742
Solid vine and crash fixes for it
2015-12-23 23:54:59 -06:00
Vincent Lee
64a8dfbcfe
Drums, runic altar, mana pool kinda, distributor, force relay, starfield
2015-12-23 20:26:33 -06:00
Vincent Lee
eabb0f94e3
Mana beacon, unstable block, petal block
2015-12-23 17:19:23 -06:00
primetoxinz
d23cca33e1
More Item models
2015-12-23 17:07:32 -05:00
Tyler
cbbefff0ce
Merge pull request #1 from williewillus/MC18
...
merge
2015-12-23 17:03:30 -05:00
Vincent Lee
cfaeecc41a
Panes, and fixes so no crashes in debug world
2015-12-23 16:03:07 -06:00
Vincent Lee
0887191a64
All stair models done
2015-12-23 14:30:18 -06:00
Vincent Lee
b10615c909
Revert unnecessary changes
2015-12-23 00:42:00 -06:00
Vincent Lee
2c660ba82b
Merge branch 'primetoxinz-MC18' into MC18
2015-12-23 00:40:40 -06:00
Vincent Lee
92e90ed2b9
Merge branch 'MC18' of github.com:primetoxinz/Botania into primetoxinz-MC18
2015-12-23 00:39:40 -06:00
Vincent Lee
3d41be585b
Pylons kinda working
2015-12-22 23:26:27 -06:00
Vincent Lee
57e5a3d0ac
Pylon obj model possibly. item working, tile not so
2015-12-22 22:47:29 -06:00
primetoxinz
1b1e5e3bf0
Fixed Formatting
2015-12-22 23:34:35 -05:00
primetoxinz
7e0145bf34
remove debug code, whoops
2015-12-22 23:17:09 -05:00
primetoxinz
e77678593f
remove launch files
2015-12-22 23:09:21 -05:00
primetoxinz
9f429c7e17
Added most tools and armour models
2015-12-22 23:06:33 -05:00
primetoxinz
305b99b3f5
Added Models for Resources and other items
2015-12-22 22:37:27 -05:00
Vincent Lee
33b423aaa1
Lexicon item model. Alf/managlass blocks, altgrass
2015-12-22 20:28:14 -06:00
Vincent Lee
d2340905d6
Livingwood, and livingrock and livingwood stairs
2015-12-22 17:43:51 -06:00
Vincent Lee
70353cf143
Livingrock, and reorganize model names. Sorry for the diff thrashing
2015-12-22 16:48:56 -06:00
Vincent Lee
42110cec45
Fix duplicate eventhandler
2015-12-22 16:18:34 -06:00
Vincent Lee
cff6120aaf
First block models
2015-12-22 16:16:04 -06:00
Vincent Lee
56228446b8
Stub out all rendering. Compiles and runsgit add -A
2015-12-22 12:49:18 -06:00
Vincent Lee
b21d6f5ee6
All non rendering components compile
2015-12-22 11:13:23 -06:00
Vincent Lee
0db00970ab
Made futurestone registration a bit less hardcody
2015-12-21 22:44:11 -06:00
Vincent Lee
320f6405e4
Rendering tweaks, and fix up all stairs/slabs/walls
2015-12-21 22:40:52 -06:00
Vincent Lee
a23f317368
Finish BC integratoin
2015-12-21 19:49:51 -06:00
Vincent Lee
5379cda754
Update buildcraft api to 7.2.0 and integration mostly
2015-12-21 19:44:52 -06:00
Vincent Lee
a9b060257f
1.8.8 tess fixes, potential double plant fix, bunch of reflectoin in spawner claw
2015-12-21 19:25:58 -06:00
Vincent Lee
5d666cd891
Some 1.8.8 tessellator changes
2015-12-21 13:53:31 -06:00
Vincent Lee
ffe7b4ccc8
API looks to be good again
2015-12-21 13:01:33 -06:00
Vincent Lee
c480a3303a
Remove unneeded casts since 1.8.8 restores generics
2015-12-21 12:53:59 -06:00
Vincent Lee
dbb549ba2a
Merge upstream release 245
2015-12-21 12:47:58 -06:00
Vincent Lee
b8a1a9cd5d
Some 1.8.8 fixes before merging upstream
2015-12-21 12:24:28 -06:00
Vincent Lee
5211ed9149
Merge upstream and probably introduce a zillion errors
2015-12-14 16:38:07 -06:00
Vincent Lee
6b03424e2c
Commit before merging upstream
2015-12-14 12:46:31 -06:00
Vincent Lee
8361d1743d
Some rendering experiements, update notes
2015-11-30 12:53:36 -06:00
Vincent Lee
6cc88f1c5a
Almost done with TEs
2015-11-29 16:45:36 -06:00
Vincent Lee
4736be9d61
Corporea done
2015-11-29 15:59:17 -06:00
Vincent Lee
e4864d2e7b
Red string blocks and tiles
2015-11-29 15:26:59 -06:00
Vincent Lee
d0a14a451b
More IIcon exorcisms, various compilation fixes now that we know states
2015-11-29 15:06:03 -06:00
Vincent Lee
f58440b79a
Misc cleanups and fixes. All magic flowers compile now!
2015-11-29 12:59:22 -06:00
Vincent Lee
9ea899bad5
Fix alf portal states, made the api compile now!
2015-11-28 20:54:09 -06:00
Vincent Lee
e4b58e0c2d
Remove InterpolatedIcon. Now present natively in 1.8
2015-11-28 19:57:33 -06:00
Vincent Lee
a9baf71924
TESRs and fixed quite a few todos
2015-11-28 19:55:12 -06:00
Vincent Lee
4a4763b075
Light work on decor
2015-11-27 22:58:18 -06:00
Vincent Lee
1817e75b5d
More decor states
2015-11-27 13:04:23 -06:00
Vincent Lee
6c637d27b2
Lots of rendering work. Multiblock structures migrated from to states
2015-11-26 22:14:46 -06:00
Vincent Lee
e679a2062d
Misc touchups everywhere. Move ModBanners in block pkg
2015-11-26 17:33:36 -06:00
Vincent Lee
bf81e002e8
More blockstates
2015-11-26 12:03:33 -06:00
Vincent Lee
a40a443607
Merge upstream
2015-11-26 02:27:25 -06:00
Vincent Lee
ddf2a94aa1
Some states in the root package. here we go!
2015-11-26 02:18:20 -06:00
Vincent Lee
2dae52a9ff
Full GLStatemanager substitution
2015-11-26 00:50:46 -06:00
Vincent Lee
9cd7a4a0d5
Tweak multiblocks a bit
2015-11-26 00:20:11 -06:00
Vincent Lee
0a7268fc98
Move botaniaStateProps and all state enums into the api so others can use them to set our blockstates
2015-11-26 00:09:29 -06:00
Vincent Lee
4426f8904f
Some touchups on entities
2015-11-25 01:36:21 -06:00
Vincent Lee
c0bcfb6448
Most functional flora
2015-11-24 17:31:19 -06:00
Vincent Lee
b4d9c3ded8
Some of genereating flora
2015-11-24 01:10:03 -06:00
Vincent Lee
605e38337a
Rest of root package TE
2015-11-24 00:49:57 -06:00
Vincent Lee
b72be67dd7
Smaller TE's in the root package. several of the bigger ones left
2015-11-22 23:56:18 -06:00
Vincent Lee
c2f1a9ab17
corporea, mana, and string tile entities
2015-11-22 16:19:02 -06:00
Vincent Lee
999705294d
root package of block, first pass done
2015-11-22 15:28:50 -06:00
Vincent Lee
3fe15e6b7d
Remove trivial IIcon refs in Item to get a better sense of my progress there
2015-11-21 23:12:46 -06:00
Vincent Lee
921370b546
block. corporea, dispenser, mana, string. some of the base pkg too
2015-11-21 22:53:58 -06:00
Vincent Lee
3f9d5c888f
Finish rods (a bit of block leaked in, oops)
2015-11-20 18:36:01 -06:00
Vincent Lee
55bf02798d
Most of rod package
2015-11-20 13:45:35 -06:00
Vincent Lee
e3b22975cb
Merge upstream
2015-11-20 01:00:31 -06:00
Vincent Lee
3ebcd10233
Finish ring of Loki
2015-11-20 00:53:35 -06:00
Vincent Lee
02ed9f1c84
Finish tools and relics except some of Loki
2015-11-18 19:07:37 -06:00
Vincent Lee
27126c074d
Some of tool package
2015-11-18 18:39:52 -06:00
Vincent Lee
8cc23c7fb3
Update readme
2015-11-18 08:38:20 -06:00
Vincent Lee
9cbd2708db
Base item package, tc interaction items
2015-11-18 08:33:32 -06:00
Vincent Lee
4c0922f0b4
Update Botania refs to TC api
2015-11-18 01:04:51 -06:00
Vincent Lee
ed75f4a4b7
Delete parts of TC5 api that actually weren't needed. Oops.
2015-11-18 01:01:46 -06:00
Vincent Lee
5c98dc562c
Update RF API to Progressive Automation / FluxDucts' variant
2015-11-18 00:54:48 -06:00
Vincent Lee
da1dc51202
Update to TC5 API
2015-11-18 00:49:52 -06:00
Vincent Lee
2376287dd7
Some items
2015-11-17 13:09:45 -06:00
Vincent Lee
750276db9b
Merge upstream
2015-11-17 01:07:15 -06:00
Vincent Lee
58dbb0f9cf
Lenses, materials, records, relics, equipment
2015-11-17 01:03:09 -06:00
Vincent Lee
6fb9b0101e
Some entities
2015-11-17 00:30:32 -06:00
Vincent Lee
3b8926c24b
Easy stuff in common.core
2015-11-16 16:37:03 -06:00
Vincent Lee
bbbe93a8de
common.lexicon
2015-11-16 13:40:19 -06:00
Vincent Lee
9da9d61880
break from client for now
2015-11-16 13:35:58 -06:00
Vincent Lee
29e42d86ea
Some of client.render.tile
2015-11-16 13:15:32 -06:00
Vincent Lee
88ca096ae0
client.gui.lexicon
2015-11-14 19:48:26 -06:00
Vincent Lee
b07cac07a0
Fix the ctors oops
2015-11-14 15:50:23 -06:00
Vincent Lee
afb9650b12
Update EntityThrowableCopy to 1.8 ver
2015-11-14 15:49:58 -06:00
Vincent Lee
a1c3b00ae0
client.core.fx
2015-11-14 12:28:02 -06:00
Vincent Lee
b22e485217
Some of client.core.handler. Most of this will need to be migrated to layerrenderers
2015-11-14 12:21:30 -06:00
Vincent Lee
7ad1820fcb
Low hanging fruit: core.world, core.network, core.lib, core.crafting, some miscs
2015-11-14 00:59:47 -06:00
Vincent Lee
8591551a1b
Lots of tessellator substitutions, full findreplace from CC to BlockPos. Some low hanging fruit in client
2015-11-14 00:39:42 -06:00
Vincent Lee
4d674da1b7
Most of what I can do with API done.
2015-11-14 00:28:00 -06:00
Vincent Lee
d293a7dcc7
update readme
2015-11-13 20:22:39 -06:00
Vincent Lee
920324b135
Much of the API (blockpos and enumfacing, some low hanging fruit). Not done with it yet though.
2015-11-13 20:19:29 -06:00
Vincent Lee
67d5d65902
Shotgun tile.getWorldObj into tile.getWorld. May cause some individual errors but fix later
2015-11-13 19:53:37 -06:00
Vincent Lee
f6cfeedd1d
Vec3 and AABB factory to plain ctor
2015-11-13 19:51:23 -06:00
Vincent Lee
5a11a58346
cpw.mods.fml to net.minecraftforge.fml
2015-11-13 19:50:23 -06:00
Vincent Lee
da2e5dfa51
Update build.gradle
2015-11-13 19:49:41 -06:00