Update to 1.18.2

This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Make anvil cumulative cost configurable
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index 35ceeda917c3c49466f97b16a32c7ce9440f46c9..d2ba5cd4d52105d91fd1e67fc6d05d72cfd5dfea 100644
index 3f54c3dcb58cfb3e08149bd09c820f379b9654ba..1c7f18e2ddc6b3c4a91b0545374f49ebcc6baaa0 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -341,7 +341,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -340,7 +340,7 @@ public class AnvilMenu extends ItemCombinerMenu {
}
public static int calculateIncreasedRepairCost(int cost) {
@@ -18,7 +18,7 @@ index 35ceeda917c3c49466f97b16a32c7ce9440f46c9..d2ba5cd4d52105d91fd1e67fc6d05d72
public void setItemName(String newItemName) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 41e5dee301c2a0b6ab603c3ebe1b9eccf7b3e7c8..d1c67ef98ce3b6db9a40b1c0734ea943f98b45c6 100644
index 799340bb7e603805d009357cabe6bb9ff2219d88..611fbde429a6742715c54dfd61f8b0a9877c18da 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -264,6 +264,7 @@ public class PurpurConfig {