Partial merge of branch 'master'

Minecraft Wiki link: bc67914 edd7c54 Patrons: c09b43e e69e6bb 1502e71 36810e9 Web: 7d32caf cea9945 MiscUtil: 06a4520
VazkiiMods · Oct 30, 2023 · c4026dc · c4026dc
1 parent 68b09c3
commit c4026dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/QuarkWeb b/QuarkWeb
diff --git a/contributors.properties b/contributors.properties
@@ -883,3 +883,7 @@ Rosenator=2
 MrBons4i=2
 VolrathStormborn=2
 Lorykeee=2
+TheMelon27=2
+YYMB=2
+RavenDarkeye=1
+kairosylph=2
diff --git a/src/main/java/vazkii/quark/base/handler/MiscUtil.java b/src/main/java/vazkii/quark/base/handler/MiscUtil.java
@@ -262,7 +262,7 @@ public static void onKeystroke(KeyPressed.Pre event) {
 				"-FCYE87P5L0","mybsDDymrsc","6a4BWpBJppI","thpTOAS1Vgg","ZNcBZM5SvbY","_qJEoSa3Ie0",
 				"RWeyOyY_puQ","VBbeuXW8Nko","LIDe-yTxda0","BVVfMFS3mgc","m5qwcYL8a0o","UkY8HvgvBJ8",
 				"4K4b9Z9lSwc","tyInv6RWL0Q","tIWpr3tHzII","AFJPFfnzZ7w","846cjX0ZTrk","XEOCbFJjRw0",
-				"GEo5bmUKFvI","b6li05zh3Kg", "_EEo-iE5u_A", "SPYX2y4NzTU"
+				"GEo5bmUKFvI","b6li05zh3Kg","_EEo-iE5u_A","SPYX2y4NzTU","UDxID0_A9x4","ZBl48MK17cI"
 			};
 			final int[] keys = new int[] { 265, 265, 264, 264, 263, 262, 263, 262, 66, 65 };
 			if(event.getScreen() instanceof ZetaScreen) {

diff --git a/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java b/src/main/java/vazkii/quark/content/tools/module/PathfinderMapsModule.java
@@ -81,7 +81,7 @@ public class PathfinderMapsModule extends ZetaModule {
 			<id>,<level>,<min_price>,<max_price>,<color>,<name>
 
 			With the following descriptions:
-			 - <id> being the biome's ID NAME. You can find vanilla names here - https://minecraft.gamepedia.com/Biome#Biome_IDs
+			 - <id> being the biome's ID NAME. You can find vanilla names here - https://minecraft.wiki/w/Biome#Biome_IDs
 			 - <level> being the Cartographer villager level required for the map to be unlockable
 			 - <min_price> being the cheapest (in Emeralds) the map can be
 			 - <max_price> being the most expensive (in Emeralds) the map can be
+26 −4		features.json
+ −		img/features/tweaks/slimes-to-magma-cubes.jpg