lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1976 commits 12 branches 0 tags 44 MiB
Commit graph

1475 commits

Author SHA1 Message Date
Nicholas Ignoffo
717279db4b Bound tools now properly mark themselves as tools 
Because *somebody* forgot to do that.
 2017-05-08 19:36:48 -07:00
Nicholas Ignoffo
324d49e3ac Sanity check pos passed by client 
Prevents malicious clients from loading arbitrary chunks.

Thanks to pau101 for spotting it.

(cherry picked from commit 7c19e2e)
 2017-04-30 17:21:05 -07:00
Nicholas Ignoffo
3be9bdf4bc Allow commands to be used in command blocks (#1117) 
(cherry picked from commit 805576a)
 2017-04-03 17:59:16 -07:00
Nicholas Ignoffo
5ea7177bdb Re-implement Soul Fray on death (#1118) 
This should be all that's needed

(cherry picked from commit bffd191)
 2017-04-03 17:59:06 -07:00
Nicholas Ignoffo
dd2c6915f3 Fix bound tools not checking if they're bound (#1114) 
(cherry picked from commit 3134f6b)
 2017-03-28 19:26:29 -07:00
Nicholas Ignoffo
c607a1ccad Rewrite the placer ritual 
Includes a slight nerf: Instead of placing the entire 25x25 at the same time, it now places 1 block at a time.

This was brought on by 30 minutes of debugging an intended feature that was mistaken for a bug in #1103

TODO: Rewrite most of the rituals to get rid of any remaining legacy code

(cherry picked from commit a5a47c4)
 2017-03-14 20:25:53 -07:00
Nicholas Ignoffo
f845c1306d Change lots of recipes to use oredict (#1101) 
I probably missed a few

(cherry picked from commit 41c2f37)
 2017-03-14 20:24:09 -07:00
A_D
2b92151419 fixed inconsistent altar tier readout with seer's sigil (#1094) 2017-03-12 04:07:24 -07:00
Nicholas Ignoffo
9822a79265 Fix JEI not displaying armor tomes 
(cherry picked from commit 4e5bc46)
 2017-03-03 17:22:23 -08:00
majikguy
9540df7cf1 Fixed a typo that made stage 4 of the Body Builder upgrade 5x as difficult as stage 5. (#1080) 2017-03-03 16:57:04 -08:00
Nicholas Ignoffo
0b93c11733 Sort rituals by component count to avoid conflicts (#1070) 
Large rituals can now use, for example, the Serenade of the Nether layout if wanted.
 2017-02-27 17:37:30 -08:00
Nicholas Ignoffo
fedea85993 Fix Alchemy Table JEI compat being fundamentally wrong (#1069) 2017-02-27 16:44:40 -08:00
Nicholas Ignoffo
719cff06e1 Child mobs are now viable for sacrifice at half the rate 2017-02-25 18:00:17 -08:00
Nicholas Ignoffo
3f24e464e6 Rewrite Hymn of Syphoning for caps 
Needs testing and needs to be optimized.
 2017-02-25 17:59:10 -08:00
Nicholas Ignoffo
c4f92708b1 Dagger of Sacrifice should not work for FakePlayers 2017-02-25 17:16:25 -08:00
Nicholas Ignoffo
32668f70ca Break early if activation crystal isn't bound 
Fixes annoying and usually false "not configured correctly" message.

https://redd.it/5vte95
 2017-02-23 20:01:07 -08:00
Nicholas Ignoffo
970acd4e69 Fix crash when teleposing Demon Will Crystals (#1062) 2017-02-23 19:45:09 -08:00
Nicholas Ignoffo
b55b453e6d Fix crash when using newly created toggle sigils (#1059) 2017-02-22 16:25:06 -08:00
Nicholas Ignoffo
e8f0194ed8 Special case RAW will when converting enums 2017-02-22 16:15:45 -08:00
Nicholas Ignoffo
461c4762fe Fix oddity with comparators on Altars (#1058) 
*shakes fist at @Arcaratus*
 2017-02-21 16:08:34 -08:00
Nicholas Ignoffo
0d4524cafc Fix crash when checking if stacks can combine (#1053) 2017-02-20 14:13:14 -08:00
Nicholas Ignoffo
1fb221c7f0 Fix crash when creating a tank stack with meta > 15 (#1057) 
Also finally fixes the tanks so they properly drop themselves.
 2017-02-20 14:07:35 -08:00
Nicholas Ignoffo
f0e3aa6602 Missed a couple files 2017-02-13 19:38:08 -08:00
Nicholas Ignoffo
2ee2cc5ee6 More proper fix for #1019 2017-02-13 19:35:14 -08:00
Nicholas Ignoffo
5bf5fd570d Fix duplicate LA attributes overwriting each other (#1019) 
Somebody please save me from this horrible horrible code
 2017-02-13 19:09:19 -08:00
Nicholas Ignoffo
9027f767a6 Fix ore doubling potentially adding invalid recipes (#1051) 2017-02-13 17:13:28 -08:00
Nicholas Ignoffo
ddb7542827 Implement an inverted MRS that requires an RS signal to function (#1022) 2017-02-13 16:21:54 -08:00
Nicholas Ignoffo
e092161a39 Downgrade tomes are now know that they're downgrades 
Also Disoriented is localized finally
 2017-02-13 12:57:41 -08:00
Nicholas Ignoffo
2d02bcf37b Fixed JEI localization (#1048) 2017-02-13 12:42:27 -08:00
Nicholas Ignoffo
dea31f5f36 Cache the bound SoulNetwork for rituals 
Avoids looking up the map data once or more each tick

(cherry picked from commit c13be9e)
 2017-02-12 18:10:22 -08:00
Nicholas Ignoffo
bb9347ba5a Fix server crash when adding guide recipe to JEI (#1045) 2017-02-12 16:01:54 -08:00
Nicholas Ignoffo
8a8bff865f IMC API for adding new altar components (#1039) 
CC @Drullkus
 2017-02-12 01:18:16 -08:00
pksiazek
6802bc5f47 #1036 Fixed Living Armor sacrifical upgrade (#1037) 2017-02-06 16:03:27 -08:00
Nicholas Ignoffo
59920ef34f Bound tools should drain LP (#1033) 2017-02-05 12:42:28 -08:00
Nicholas Ignoffo
13228f61da Temporarily remove item rendering for tank fluid 
You cannot bake GL stuff. This is bad. Also it got broken at one point.

I'll re-add this once I remove the need for a TESR.
 2017-02-05 11:58:23 -08:00
Nicholas Ignoffo
305e001b15 No-spam messages should be handled on the main thread (#1035) 2017-02-04 22:44:57 -08:00
Nicholas Ignoffo
85a8a12a6f Update mappings 2017-02-04 22:43:19 -08:00
Nicholas Ignoffo
7b21439a03 Remove cross-version proxy 
1.9.4 support has been dropped. Extremely little gain for major drawbacks.
 2017-02-04 21:43:01 -08:00
Nicholas Ignoffo
4c614df15e Empty flasks can now be refilled (#976) 
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.
 2016-12-30 18:27:16 -08:00
Nicholas Ignoffo
b6eae2fc67 Fix Expulsion whitelist (#1010) 2016-12-30 17:43:02 -08:00
Nicholas Ignoffo
c7f2b7d29c Add current charge to Waila tooltip (#1013) 2016-12-30 17:34:43 -08:00
Nicholas Ignoffo
09007c58b2 Change meteor config NPE with EnderCore to a useful error message 2016-12-30 17:12:38 -08:00
Nicholas Ignoffo
fffed0e34c Gold meteor only needs it's version set once 2016-12-30 17:11:00 -08:00
Nicholas Ignoffo
5c1b8b17bd Fix meteor config not generating new defaults 2016-12-30 17:10:36 -08:00
Nicholas Ignoffo
a5449d3abc Blacklist sentient spectres from WoS and Sacrifice (#1015) 
A config refresh is required for this to take effect. Needs mentioning in changelog.
 2016-12-30 16:37:19 -08:00
WayofTime
f08307180c Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. (#1011) 2016-12-20 19:42:39 -05:00
WayofTime
afa3d1ef91 Made it so the book does not give the filling recipe when the Blood Orb recipe is queried. 2016-12-20 19:28:16 -05:00
Nicholas Ignoffo
082d2b8f4d Sigils should draw LP from the bound network, not the user 2016-12-19 17:32:03 -08:00
WayofTime
a5a17f6b04 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter. 2016-12-14 14:48:39 -05:00
Nicholas Ignoffo
ce52aea512 Recipes for Blood Tank 2016-12-12 00:33:25 -08:00