From 86e4cd8dae385e27e054aa813600114d691ec3ec Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 5 May 2019 01:43:49 +0200 Subject: [PATCH 01/14] Changelog. Some stuff still pending. --- changelog.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/changelog.txt b/changelog.txt index 0595047d6..44ff75624 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,51 @@ +------------------------------------------------------ +Version 2.4.? +------------------------------------------------------ + +Nut was too lazy to create a changelog, it's AEon's turn now! +Based on commit history from Feb 02 - May the 4th be with you + + +Living Armor: + - Fixed "Soft Fall" not preventing damage + - "Nocturnal Prowess" should not flash anymore + - "Trickshot" now ignores HurtResistanceTime + - "Trickshot" now works properly with sentient arrows + - "Step Assist" does not take effect while sneaking + +Sentient Bow: + - Fixed Destructive Will arrows exploding continuously + - Fixed Tipped Arrows getting improved even if no Will can be used + +Sigils: + - Buffed "Sigil of the Fast Miner" to be in accordance to the "Sanguine Scientium" + - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect + - Added "Whirlwind" to the potion registry + - Fixed broken Sigil tooltip formatting + +Misc: + - Fixed routing node oredict filter + - Use TextFormatting rather than color codes in block lang names + - Mystery drain still mysterious + - Fixed some and streamlined ritual block ranges + - Formatted Project code + - Fixed BlockState parsing + - Fixed "Blood Letter's Pack" and "Coat of Arms" passing the wrong hand + - Stop insertions into Demon Crucible if the inventory is not empty + - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) + - Fixed "Unbending" mod incompatibility + - Fixed world unload crash + - Fixed Teleposers crashing if someone force-fed it junk + - added Nut being angery at contributors for messing stuff up + +Not merged yet: + - Fixed "Serenade of the Nether" replacing lava source blocks with lava + - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key + - Fixed FluidSigils only filling fractions of a bucket and not being able to place liquids after having filled fractions of a bucket once + - Added Veil of Evil & Ward of Sacrosanctity + - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot + - Added creative item handling and new creative/test items + ------------------------------------------------------ Version 2.4.0 ------------------------------------------------------ From ad0631ac2dc7cce9a174997eeb78a94615a69ba8 Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 5 May 2019 01:48:59 +0200 Subject: [PATCH 02/14] "Unbending" mod has been renamed to "Unmending" --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 44ff75624..fa8b7d9dd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -33,7 +33,7 @@ Misc: - Fixed "Blood Letter's Pack" and "Coat of Arms" passing the wrong hand - Stop insertions into Demon Crucible if the inventory is not empty - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) - - Fixed "Unbending" mod incompatibility + - Fixed "Unmending" mod incompatibility - Fixed world unload crash - Fixed Teleposers crashing if someone force-fed it junk - added Nut being angery at contributors for messing stuff up From 4f075ddf586268b6276ab0ff0ec2accfe3450560 Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 5 May 2019 02:02:23 +0200 Subject: [PATCH 03/14] Clarifications & Formatting --- changelog.txt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/changelog.txt b/changelog.txt index fa8b7d9dd..97ba775cd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -25,19 +25,21 @@ Sigils: Misc: - Fixed routing node oredict filter - - Use TextFormatting rather than color codes in block lang names - - Mystery drain still mysterious - - Fixed some and streamlined ritual block ranges - - Formatted Project code - - Fixed BlockState parsing - - Fixed "Blood Letter's Pack" and "Coat of Arms" passing the wrong hand + - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) - Stop insertions into Demon Crucible if the inventory is not empty - - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) + - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) - Fixed "Unmending" mod incompatibility - - Fixed world unload crash - - Fixed Teleposers crashing if someone force-fed it junk + - Fixed Teleposers crashing the game if someone force-fed it junk - added Nut being angery at contributors for messing stuff up +Technical Stuff no player cares about: + - Formatted Project code + - Fixed BlockState parsing + - Fixed some and streamlined ritual block ranges + - Mystery drain still mysterious + - Use TextFormatting rather than color codes in block lang names + - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) + Not merged yet: - Fixed "Serenade of the Nether" replacing lava source blocks with lava - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key From 5af26b5553fe675e132de42a8712dde98c7622de Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 5 May 2019 02:16:34 +0200 Subject: [PATCH 04/14] Update --- changelog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 97ba775cd..938d2dfe1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -41,10 +41,10 @@ Technical Stuff no player cares about: - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) Not merged yet: - - Fixed "Serenade of the Nether" replacing lava source blocks with lava + - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key - Fixed FluidSigils only filling fractions of a bucket and not being able to place liquids after having filled fractions of a bucket once - - Added Veil of Evil & Ward of Sacrosanctity + - Ported Veil of Evil & Ward of Sacrosanctity - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot - Added creative item handling and new creative/test items From 59526169d608aa06c2d68bd6f804cfbfc870b650 Mon Sep 17 00:00:00 2001 From: iorce Date: Mon, 6 May 2019 13:32:30 +0200 Subject: [PATCH 05/14] Added Compression Sigil PR --- changelog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.txt b/changelog.txt index 938d2dfe1..1bbcca575 100644 --- a/changelog.txt +++ b/changelog.txt @@ -47,6 +47,8 @@ Not merged yet: - Ported Veil of Evil & Ward of Sacrosanctity - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot - Added creative item handling and new creative/test items + - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) + - Greatly improved "Sigil of Compression" performance ------------------------------------------------------ Version 2.4.0 From 2d55983be684f8f25bd5fa84a855b097e8a0b750 Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Mon, 6 May 2019 22:59:46 +0000 Subject: [PATCH 06/14] Update changelog.txt --- changelog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 1bbcca575..f2c978322 100644 --- a/changelog.txt +++ b/changelog.txt @@ -25,6 +25,7 @@ Sigils: Misc: - Fixed routing node oredict filter + - Fixed mimic vanishing in some cases - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) - Stop insertions into Demon Crucible if the inventory is not empty - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) @@ -34,7 +35,7 @@ Misc: Technical Stuff no player cares about: - Formatted Project code - - Fixed BlockState parsing + - Fixed BlockState parsing (mimic vanishing) - Fixed some and streamlined ritual block ranges - Mystery drain still mysterious - Use TextFormatting rather than color codes in block lang names @@ -1159,4 +1160,4 @@ Changed - A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. Bug Fixes -- \ No newline at end of file +- From b95148172395c4abcc704c2231414bd697620c01 Mon Sep 17 00:00:00 2001 From: iorce Date: Thu, 9 May 2019 01:44:50 +0200 Subject: [PATCH 07/14] Added Network command PR change --- changelog.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index f2c978322..b3dea5ef5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,10 @@ ------------------------------------------------------ Version 2.4.? ------------------------------------------------------ + ^- fill in appropriate version number Nut was too lazy to create a changelog, it's AEon's turn now! -Based on commit history from Feb 02 - May the 4th be with you +Changes made from Feb 02 - now (Fill end date in later) Living Armor: @@ -46,10 +47,12 @@ Not merged yet: - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key - Fixed FluidSigils only filling fractions of a bucket and not being able to place liquids after having filled fractions of a bucket once - Ported Veil of Evil & Ward of Sacrosanctity - - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot + - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot (effects applied on attack) - Added creative item handling and new creative/test items - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) - Greatly improved "Sigil of Compression" performance + - Fixed `/bloodmagic network get` command + - Added translation keys for tickethistory command help strings ------------------------------------------------------ Version 2.4.0 From 75a17d21065eec01b176724006dd1858c6a40ecb Mon Sep 17 00:00:00 2001 From: iorce Date: Thu, 9 May 2019 04:50:22 +0200 Subject: [PATCH 08/14] Added JEI Recipes PR --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index b3dea5ef5..d4e8ee92a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -53,6 +53,7 @@ Not merged yet: - Greatly improved "Sigil of Compression" performance - Fixed `/bloodmagic network get` command - Added translation keys for tickethistory command help strings + - Added repair recipes for Sentient Tools & Living Armor to JEI ------------------------------------------------------ Version 2.4.0 From dac8a9374715ed0d40790f64fd876be76092fafe Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sat, 11 May 2019 10:21:49 +0000 Subject: [PATCH 09/14] Update changelog.txt --- changelog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.txt b/changelog.txt index d4e8ee92a..11f165a73 100644 --- a/changelog.txt +++ b/changelog.txt @@ -49,6 +49,11 @@ Not merged yet: - Ported Veil of Evil & Ward of Sacrosanctity - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot (effects applied on attack) - Added creative item handling and new creative/test items + - Orb of Testing (Cap, Fill, Empty, Get) + - Creative Activation Crystal (Prevents LP, Will drain, Nausea) + - Ritual Diviner (Places instantly, ignores blocks) + - Draft of Angelus (increases upgrade points to 10,000 if used with >200 points and creative) + - Tartaric Gems - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) - Greatly improved "Sigil of Compression" performance - Fixed `/bloodmagic network get` command From 846de02a3e12e75943e701d91527f8edf99e77bb Mon Sep 17 00:00:00 2001 From: Tobias Gremeyer Date: Sat, 11 May 2019 10:27:52 +0000 Subject: [PATCH 10/14] Removed empty bugfix category. From V2.0.0 --- changelog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/changelog.txt b/changelog.txt index 11f165a73..9ea7dba6a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1167,6 +1167,3 @@ New Changed - Lots of internals have changed. Too many to list. - A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. - -Bug Fixes -- From 786011501079d7e78969405aeb03151af90a90ef Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 11 May 2019 22:26:47 +0000 Subject: [PATCH 11/14] Update changelog.txt --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9ea7dba6a..db4a691c7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -25,7 +25,7 @@ Sigils: - Fixed broken Sigil tooltip formatting Misc: - - Fixed routing node oredict filter + - Fixed routing node oredict filter (crashes) - Fixed mimic vanishing in some cases - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) - Stop insertions into Demon Crucible if the inventory is not empty From 991ac16571abbf61ab1dae1aff87910d9b723e92 Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 19 May 2019 19:00:33 +0200 Subject: [PATCH 12/14] Moved pending PR texts, added RitualJumping PR text, bumped version number --- changelog.txt | 28 ++++++++++++++++++---------- gradle.properties | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/changelog.txt b/changelog.txt index d4e8ee92a..f48cef174 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ ------------------------------------------------------ -Version 2.4.? +Version 2.4.1 ------------------------------------------------------ ^- fill in appropriate version number @@ -23,6 +23,15 @@ Sigils: - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect - Added "Whirlwind" to the potion registry - Fixed broken Sigil tooltip formatting + - Fixed Sigil of Holding not updating some Sigil data, allowing for exploits + - Greatly improved "Sigil of Compression" performance + - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) + + +Rituals: + - Ported Veil of Evil & Ward of Sacrosanctity + - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) + - Added configurability to Ritual of the High Jump by modifying a new ritual area with the Ritual Tinkerer Misc: - Fixed routing node oredict filter @@ -33,6 +42,9 @@ Misc: - Fixed "Unmending" mod incompatibility - Fixed Teleposers crashing the game if someone force-fed it junk - added Nut being angery at contributors for messing stuff up + - Added some Russian language strings for the guide book + - Added repair recipes for Sentient Tools & Living Armor to JEI + Technical Stuff no player cares about: - Formatted Project code @@ -41,19 +53,15 @@ Technical Stuff no player cares about: - Mystery drain still mysterious - Use TextFormatting rather than color codes in block lang names - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) + - Fixed `/bloodmagic network get` command + - Added translation keys for tickethistory command help strings Not merged yet: - - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) - - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key + + - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key [regression: + - Added creative item handling and new creative/test items - Fixed FluidSigils only filling fractions of a bucket and not being able to place liquids after having filled fractions of a bucket once - - Ported Veil of Evil & Ward of Sacrosanctity - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot (effects applied on attack) - - Added creative item handling and new creative/test items - - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) - - Greatly improved "Sigil of Compression" performance - - Fixed `/bloodmagic network get` command - - Added translation keys for tickethistory command help strings - - Added repair recipes for Sentient Tools & Living Armor to JEI ------------------------------------------------------ Version 2.4.0 diff --git a/gradle.properties b/gradle.properties index 0e38a0097..21145a3d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.4.0 +mod_version=2.4.1 mc_version=1.12.2 forge_version=14.23.5.2808 curse_id=224791 From 709cf67add46326769982a8c223605b228cf37fe Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 19 May 2019 19:02:50 +0200 Subject: [PATCH 13/14] forgot version number --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 9fb1ac533..485b81000 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ ------------------------------------------------------ -Version 2.4.? +Version 2.4.1 ------------------------------------------------------ ^- fill in appropriate version number From c25e8e4fe8f681d855a56bb19a8c62dffab7d33b Mon Sep 17 00:00:00 2001 From: iorce Date: Sun, 19 May 2019 19:04:35 +0200 Subject: [PATCH 14/14] Remove pending merges --- changelog.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/changelog.txt b/changelog.txt index 485b81000..11ab26ad9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,6 @@ ------------------------------------------------------ Version 2.4.1 ------------------------------------------------------ - ^- fill in appropriate version number Nut was too lazy to create a changelog, it's AEon's turn now! Changes made from Feb 02 - now (Fill end date in later) @@ -56,17 +55,6 @@ Technical Stuff no player cares about: - Fixed `/bloodmagic network get` command - Added translation keys for tickethistory command help strings -Not merged yet: - - - Fixed "Gate of the Fold" and altered its functionality to accomodate multiple portals with the same key [regression: - Fixed FluidSigils only filling fractions of a bucket and not being able to place liquids after having filled fractions of a bucket once - - Added additional Sentient Sword mechanics if a Sigil is held in the offhand slot (effects applied on attack) - - Added creative item handling and new creative/test items - - Orb of Testing (Cap, Fill, Empty, Get) - - Creative Activation Crystal (Prevents LP, Will drain, Nausea) - - Ritual Diviner (Places instantly, ignores blocks) - - Draft of Angelus (increases upgrade points to 10,000 if used with >200 points and creative) - - Tartaric Gems - ------------------------------------------------------ Version 2.4.0 ------------------------------------------------------