Commit graph

1813 commits

Author SHA1 Message Date
WayofTime
4a58fc5518 Updated Forge to 1813. Worked on the SentientArmour so that it is able to use the different will types depending on what is the highest. 2016-03-29 09:22:25 -04:00
WayofTime
4ea3e0ca92 Created visual niceties when an item uses/contains a different will type. 2016-03-28 20:14:05 -04:00
Yulife
9a4bf8578f Demon Will Variants & Formula 2016-03-28 17:15:11 +02:00
WayofTime
bd79afd46d Fixed the divination sigil and did a variety of other fixes. 2016-03-28 07:25:51 -04:00
Nick
c2fe583496 Temporary workaround for binding
Also fixes lots of things that went wonky when #684 was merged

I have no clue how much is still broken. Guess we'll find out :D
2016-03-27 20:11:03 -07:00
Nick
1aaa817e65 Cleanup Alchemy Array recipe registry a bit 2016-03-27 20:09:30 -07:00
WayofTime
ed42650c2e Playing with secondary effects provided by the offhand. 2016-03-27 16:53:08 -04:00
Nick Ignoffo
000ef44068 Merge pull request #687 from Arcaratus/1.9
OreDict recipe support!
2016-03-27 10:13:42 -07:00
Arcaratus
800ffa213b OreDict Altar Recipes!
OreDict support for altar and alchemy array recipes!
Changed the alchemy array JEI image

Recipe modularizations

Fix

Like this?

Tehnut patch

Change to List<ItemStack>
2016-03-27 13:12:56 -04:00
Nick
30bc020055 Localized some routing tooltips/chat 2016-03-26 12:32:51 -07:00
WayofTime
5cb39d1dbd Updated to Forge 1811 2016-03-26 14:32:06 -04:00
WayofTime
f9cb1a08ba Finished the crystal automation ritual, "Gathering of the Forsaken Souls." 2016-03-24 19:10:57 -04:00
CJCutrone
ba00b166aa Fix ItemBoundSword damage [1.9 branch]
Redid this on the proper branch.
https://github.com/WayofTime/BloodMagic/pull/685
2016-03-24 16:45:51 -05:00
WayofTime
3d2e1d911f 90% finished implementing the crystal growing ritual. 2016-03-24 16:18:39 -04:00
WayofTime
f0730791f7 - Changed the growth behavior of the crystals
- Fixed Potion getting for various methods
- Started work on crystal automation ritual
- Finished first iteration of the iterator of AreaDescriptor
2016-03-24 14:11:05 -04:00
Arcaratus
0383f0fb31 Move some base classes into the API
Add Javadocs for API classes that didn't already have them

Redo

'nother redo

Another redo

Update ItemSigil.java

Last one, I swear

Fix
2016-03-23 20:23:39 -04:00
WayofTime
6a40dbab0a Added (not so great) WIP textures for the crystal items 2016-03-22 17:04:46 -04:00
WayofTime
801355c051 Fixed rendering of .obj models in hand as well as a few small tweaks to attachment logic for routing nodes. 2016-03-22 11:11:11 -04:00
WayofTime
95b10f35c8 Fixed "see through world" syndrome for most blocks 2016-03-22 09:31:47 -04:00
Nick
d8fe6d21bd Update Forge + Mappings 2016-03-21 12:55:36 -07:00
Nick
aa48c540f5 Move armor items to IMeshProvider
Minor change to IMeshProvider allow for this
2016-03-20 23:21:07 -07:00
Nick
6cd993a619 Re-add localization checks to tooltips 2016-03-20 22:55:03 -07:00
WayofTime
fc70319fa2 Sentient Bow now properly renders when pulling. 2016-03-20 10:06:53 -04:00
WayofTime
2652dea81d Updated zh_CN.lang from 1.8 branch. 2016-03-19 12:48:39 -04:00
WayofTime
fdbdcd56b6 Fixed armour textures 2016-03-19 10:30:01 -04:00
WayofTime
647046fd22 Fixed sentient armour gem. 2016-03-19 10:24:37 -04:00
WayofTime
b86f7c24ed Fixed #677 2016-03-19 08:47:59 -04:00
WayofTime
48b3a7ce8b Fixed #676 2016-03-19 08:29:38 -04:00
Nick
b9e4ac1e98 Combine TranquilityHandlers into single class 2016-03-18 21:31:18 -07:00
WayofTime
fc70bcf107 Changed so items only give their "bonus" while in hand - will change for LivingArmour too. 2016-03-18 18:01:52 -04:00
WayofTime
a71673a60e Fixed so that it now boots properly 2016-03-18 17:20:48 -04:00
WayofTime
239b6e5b1f Updated teleport logic (Untested) (0 errors) 2016-03-18 17:12:34 -04:00
WayofTime
966f663270 Entities (20 errors) 2016-03-18 16:57:57 -04:00
WayofTime
ac3ac8d272 Items (27 errors) 2016-03-18 16:50:33 -04:00
WayofTime
000c4c5692 Bound Tools (61 errors) 2016-03-18 16:31:55 -04:00
WayofTime
dcbc1c0bc4 ModItems and random imports (114 errors) 2016-03-18 16:08:06 -04:00
Nick
1bcc4e47e0 Fix a few nutderps on block updates
Incorrect assumptions + adopting very early = mistakes were made
2016-03-18 13:05:57 -07:00
WayofTime
26f7c874ff EventHandler (139 errors) 2016-03-18 16:05:01 -04:00
Nick
34f5753b17 More item fixes
- Living and Sentient armor have no armor models
- (Self) Sacrifice Pack have no armor models
2016-03-18 12:45:37 -07:00
WayofTime
f95949a1c8 Sigils (257 errors) 2016-03-18 15:38:26 -04:00
Nick
d05d3b90df Update BlockInteger/String 2016-03-18 12:01:58 -07:00
WayofTime
5e9454d390 Divination and Seer sigils (362 errors) 2016-03-18 15:00:23 -04:00
WayofTime
09168fa386 More error fixes (down to 381) 2016-03-18 14:54:31 -04:00
WayofTime
7706d0667a Fixed command and rendering of the sentient arrow. 2016-03-18 13:21:45 -04:00
WayofTime
10c6829482 Block fixes 2016-03-18 13:16:38 -04:00
Nick
252a4559f0 Re-add JEI compat 2016-03-18 04:07:49 -07:00
WayofTime
0c268a0bea Test push to verify everything is working 100% 2016-03-17 16:47:15 -04:00
Nick
6c729db70c Initial 1.9 commit
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
2016-03-17 13:00:46 -07:00
Nick
f896383fe6 Allow Mob Spawners to be teleposed (default blacklisted) (#671) 2016-03-16 15:47:42 -07:00
WayofTime
134b11f177 Normalized code formatting. 2016-03-16 18:41:06 -04:00