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

1974 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 078ab16b43 Update changelog + version 2017-04-03 18:02:56 -07:00
Nicholas Ignoffo 1e25a48709 Merge remote-tracking branch 'origin/1.9' into 1.9 2017-04-03 17:59:34 -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
NatsuArashi f44ad3a449 Traditional Chinese update. (#1116) 
* Update zh_TW.lang

* Create zh_TW.lang

* Update zh_TW.lang
 2017-04-03 17:09:44 -07:00
Nicholas Ignoffo 0b0ec65ece Update changelog + version 2017-03-28 19:32:34 -07:00
Nicholas Ignoffo e91a3b348f Merge remote-tracking branch 'origin/1.9' into 1.9 2017-03-28 19:28:13 -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 692c69865a Fix README 
(cherry picked from commit 07e025d)
 2017-03-28 19:26:17 -07:00
Urey. Xue ad46745879 Update zh_CN.lang (#1052) 
* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

Also contains update for main language file

* Amendment I

* Amendment II

* use "/cut" to trick String.split(), so that we could manually split page
* Minor improvements on translation

* Amendment III

* Amendment IV

* Amendment V

* Amendment VI
 2017-03-19 09:54:40 -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
Nicholas Ignoffo f4d1bb6ca6 Update changelog + version 
(cherry picked from commit 350c7cd)
 2017-03-13 16:22:55 -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 ed0bde22e8 Update changelog + version 
(cherry picked from commit 5e2ef61)
 2017-03-07 17:37:12 -08: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
neconeco2 22354eaa0a Update ja_JP.lang (#1076) 2017-03-02 20:32:55 -08:00
Nicholas Ignoffo acf2d683c7 Update changelog + version 
(cherry picked from commit 5e2ef61)
 2017-03-02 17:54:12 -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 a8f8ad575d Update version + changelog 
(cherry picked from commit 91aeb4b)
 2017-02-21 16:54:12 -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 4ac87f5e8a Update version + changelog 2017-02-19 14:49:36 -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 9cbec7dd37 Update README 2017-02-13 16:01:19 -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
neconeco2 55949109e1 Update ja_JP.lang (#1049) 2017-02-13 12:12:17 -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 8040d85e97 Update version + changelog 2017-02-12 16:14:10 -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 24f110f790 Update version + changelog 
(cherry picked from commit b00fe38)
 2017-02-12 11:28:13 -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