prerelease changes (#215)

3 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 9931f945..a1eb03d1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -111,9 +111,9 @@ import java.util.Set;
 public class NotEnoughUpdates {
 	public static final String MODID = "notenoughupdates";
 	public static final String VERSION = "2.1.0-REL";
-	public static final int VERSION_ID = 20200;
-	public static final int PRE_VERSION_ID = 0;
-	public static final int HOTFIX_VERSION_ID = 1;
+	public static final int VERSION_ID = 20000;
+	public static final int PRE_VERSION_ID = 1;
+	public static final int HOTFIX_VERSION_ID = 0;
 	/**
 	 * Registers the biomes for the crystal hollows here so optifine knows they exists
 	 */
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
index 47e85023..8ce9d505 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
@@ -284,7 +284,7 @@ public class GuiDungeonMapEditor extends GuiScreen {
 							break;
 						case 8:
 							mapDesc = "Simple gray border";
-							mapCredit = "TomEngMaster";
+							mapCredit = "Lucy";
 							break;
 						case 9:
 							mapDesc = "Viney wood border";
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 64396905..2905a941 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -865,8 +865,8 @@ public class CalendarOverlay {
 			SBEvent firstEvent = null;
 			List<SBEvent> nextFavourites = new ArrayList<>();
 			List<Long> nextFavouritesTime = new ArrayList<>();
-			long timeUntilMajor = 0;
-			SBEvent nextMajorEvent = null;
+			long timeUntilMayor = 0;
+			SBEvent nextMayorEvent = null;
 
 			List<String> eventFavourites = NotEnoughUpdates.INSTANCE.config.hidden.eventFavourites;
 
@@ -889,10 +889,10 @@ public class CalendarOverlay {
 						}
 					}
 
-					if (nextMajorEvent == null && !sbEvent.id.split(":")[0].equals("jacob_farming") &&
+					if (nextMayorEvent == null && !sbEvent.id.split(":")[0].equals("jacob_farming") &&
 						!sbEvent.id.equals("dark_auction")) {
-						nextMajorEvent = sbEvent;
-						timeUntilMajor = timeUntilMillis;
+						nextMayorEvent = sbEvent;
+						timeUntilMayor = timeUntilMillis;
 					}
 
 					if (firstEvent == null) {
@@ -919,7 +919,7 @@ public class CalendarOverlay {
 						}
 					}
 
-					if (nextFavourites.size() >= 3 && nextMajorEvent != null) {
+					if (nextFavourites.size() >= 3 && nextMayorEvent != null) {
 						break out;
 					}
 				}
@@ -1000,18 +1000,18 @@ public class CalendarOverlay {
 								if (sbEvent.id.split(":")[0].equals("jacob_farming") && sbEvent.desc != null) {
 									tooltipToDisplay.addAll(sbEvent.desc);
 								}
-								if (nextMajorEvent != null || i < nextFavourites.size() - 1) {
+								if (nextMayorEvent != null || i < nextFavourites.size() - 1) {
 									tooltipToDisplay.add("");
 								}
 							}
-							if (nextMajorEvent != null) {
-								tooltipToDisplay.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Next Major:");
-								tooltipToDisplay.add(nextMajorEvent.display);
+							if (nextMayorEvent != null) {
+								tooltipToDisplay.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Next Mayor:");
+								tooltipToDisplay.add(nextMayorEvent.display);
 								tooltipToDisplay.add(EnumChatFormatting.GRAY + "Starts in: " + EnumChatFormatting.YELLOW +
-									prettyTime(timeUntilMajor, false));
-								if (nextMajorEvent.lastsFor >= 0) {
+									prettyTime(timeUntilMayor, false));
+								if (nextMayorEvent.lastsFor >= 0) {
 									tooltipToDisplay.add(EnumChatFormatting.GRAY + "Lasts for: " + EnumChatFormatting.YELLOW +
-										prettyTime(nextMajorEvent.lastsFor, true));
+										prettyTime(nextMayorEvent.lastsFor, true));
 								}
 							}