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

2192 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicholas Ignoffo 66ea131377 Fix JEI not seeing orbs as different items 2018-02-04 19:12:24 -08:00
Nicholas Ignoffo acdf40e2b6 Update tile entity mappings 
(cherry picked from commit c00affa)
 2018-02-04 19:10:07 -08:00
Nicholas Ignoffo 42931bcf0e JSON recipes, much to the displeasure of Elucent and shadows 
feelsgoodman

(cherry picked from commit c23d577)
 2018-02-04 19:09:37 -08:00
Nicholas Ignoffo cc8d5af401 Rename meteor files to lowercase 
(cherry picked from commit 59df51a)
 2018-02-04 19:02:07 -08:00
Nicholas Ignoffo d99cf77288 Move config to annotation system 
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
 2018-02-04 19:01:27 -08:00
Nicholas Ignoffo a10b2ece9a Fixed altar detection 2017-08-16 17:29:24 -07:00
Nicholas Ignoffo 37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo 3b173ecf17 Some models work, some don't 2017-08-15 23:01:37 -07:00
Nicholas Ignoffo 08258fd6ef Run formatter 2017-08-15 21:30:56 -07:00
Nicholas Ignoffo 61c44a831b Fix some things that went missing 2017-08-15 21:24:59 -07:00
Nicholas Ignoffo 348fee1e2a It compiles. Somehow. 2017-08-15 20:21:55 -07:00
Nicholas Ignoffo 554c9852e6 Move commonly used API systems to a plugin based system 
Create a class that implements IBloodMagicPlugin and annotate it with
`@BloodMagicPlugin`. The `register` method will be called during init.

Currently implemented systems:
- Blacklisting
  - Teleposer
  - Teleposer (entity)
  - Transposition
  - Well of Suffering
  - Green Grove
- Setting sacrificial values
- Adding altar components
 2017-08-15 18:14:28 -07:00
Nicholas Ignoffo 5fcdd978d7 this doesn't compile yet, but have something to peek at 2017-08-14 20:53:46 -07:00
Nicholas Ignoffo 973f1019a5 Update changelog + version 
(cherry picked from commit 730b26b)
 2017-06-21 20:13:52 -07:00
Nicholas Ignoffo 8c12b48695 Fix ItemStackWrapper ignoring stack's NBT (#1155) 
who even made this class i mean come on this is such a stupid thing to do like omgwtf what a moron
 2017-06-21 19:14:25 -07:00
Nicholas Ignoffo 16d4609a48 Fix HarvestHandlerStem not working (#1165) 2017-06-21 19:11:08 -07:00
Graham Hughes 061850ee29 Add crop support for Pam's Harvestcraft and Roots herbs (#1164) 
* Add harvest ritual support for Pam's crops.

* Add roots crops.

* Per @TehNut, use BM instance logger.

* Call getMaxAge rather than hardcode 3.
 2017-06-21 18:46:42 -07:00
Nicholas Ignoffo f576ec595b Fix some inverted logic with Sentient Mimics (#1149) 2017-06-01 22:31:17 -07:00
Nicholas Ignoffo 273dca3e4d Fix client not registering capability (#1150) 2017-06-01 22:17:46 -07:00
Nicholas Ignoffo f7b8dc0d84 API-facing methods for removing recipes (#1152) 2017-06-01 22:16:24 -07:00
Nicholas Ignoffo 95634f01c3 Merge remote-tracking branch 'origin/1.11' into 1.11 2017-05-27 16:04:55 -07:00
Nicholas Ignoffo 6656fe58dc Moved living armor notifications to action bar 2017-05-27 16:04:40 -07:00
NoX-programer e95b6f3bf2 Update ru_RU.lang: fix many typos (branch 1.11) (#1148) 
* Update ru_RU.lang

* Update ru_RU.lang
 2017-05-24 06:00:48 -07:00
Nicholas Ignoffo 38e54a4e2f Fixed NPE in Fluid Filter (#1139) 
(cherry picked from commit 9a7db20)
 2017-05-23 18:56:43 -07:00
Nicholas Ignoffo e9ce88fc73 Fixed capacity on tank being reset when tile was reloaded (#1138) 2017-05-23 18:53:32 -07:00
Nicholas Ignoffo 2c08d046f8 Node Router now prints to action bar instead of chat 2017-05-21 13:45:24 -07:00
Nicholas Ignoffo abef1bada7 Add support for ExU and AA crops to plantable handler (#1107) 
Theoretically. Don't actually know if their stuff is written properly.
 2017-05-21 13:08:29 -07:00
Nicholas Ignoffo c7f644528b Fix permission level for commands (#1117) 2017-05-21 12:56:51 -07:00
Nicholas Ignoffo 5b9bb07d8d Large Bloodstone Bricks should get 4 from crafting (#1125) 2017-05-21 12:29:52 -07:00
Nicholas Ignoffo a2ceee3218 Fix diamond meteor giving blocks + dynamically calculate weight (#1126) 2017-05-21 12:25:35 -07:00
Nicholas Ignoffo 66e3066dc9 Update changelog + version 2017-05-08 19:39:31 -07:00
Nicholas Ignoffo 2789e351c0 Bound tools now properly mark themselves as tools 
Because *somebody* forgot to do that.

(cherry picked from commit 717279d)
 2017-05-08 19:37:38 -07:00
Nicholas Ignoffo 7c19e2e2d2 Sanity check pos passed by client 
Prevents malicious clients from loading arbitrary chunks.

Thanks to @pau101 for spotting it.
 2017-04-30 17:20:17 -07:00
Nicholas Ignoffo 09bab4fca0 Update changelog + version 
(cherry picked from commit 078ab16)
 2017-04-03 18:04:23 -07:00
Nicholas Ignoffo bffd191efd Re-implement Soul Fray on death 
This should be all that's needed
 2017-04-03 17:57:40 -07:00
Nicholas Ignoffo 83bba44ab6 Forgot to lowercase these 2017-04-03 17:32:20 -07:00
NatsuArashi dd7f94e756 Traditional Chinese update. (#1116) 
* Update zh_TW.lang

* Create zh_TW.lang

* Update zh_TW.lang

(cherry picked from commit f44ad3a)
 2017-04-03 17:10:35 -07:00
Nicholas Ignoffo 805576a19b Allow commands to be used in command blocks (#1117) 2017-04-03 17:03:46 -07:00
Nicholas Ignoffo 78a71e47e0 Fix Alchemy Table overwriting output each time it crafts (#1119) 2017-04-03 16:56:21 -07:00
Nicholas Ignoffo de0fd9d719 Update changelog + version 
(cherry picked from commit 0b0ec65)
 2017-03-28 19:44:31 -07:00
Urey. Xue 22e3d4d62c 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

(cherry picked from commit ad46745)
 2017-03-28 19:35:31 -07:00
Nicholas Ignoffo ed59c4633e Fixed null stack in plantable harvest handler 2017-03-28 19:07:16 -07:00
Nicholas Ignoffo 487c7e4aa3 Forgot one... 2017-03-28 18:48:27 -07:00
Nicholas Ignoffo f17f284575 Nullcheck the ritual activator (#1113) 2017-03-28 18:45:45 -07:00
Nicholas Ignoffo 3134f6b9f3 Fix bound tools not checking if they're bound (#1114) 2017-03-28 18:40:24 -07:00
Nicholas Ignoffo d524cc32b7 Another null stack in the Sentient Specters 2017-03-28 18:32:25 -07:00
Nicholas Ignoffo 07e025d635 Fix README 2017-03-28 18:32:08 -07:00
Nicholas Ignoffo 7cafd833c3 Fix fluid dupe when inserting into blood tank with bucket (#1108) 2017-03-20 22:37:23 -07:00
Nicholas Ignoffo a5a47c42aa 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
 2017-03-14 20:17:57 -07:00
Nicholas Ignoffo 216bdb2d2e Fixed many sigils using the wrong stack for their logic (#1102) 
This is why you use custom methods for things like this instead of MC methods
 2017-03-14 19:33:13 -07:00