diff --git a/.github/ISSUE_TEMPLATE/general_issue.yml b/.github/ISSUE_TEMPLATE/general_issue.yml index aec03ca3760..d0115b5f1f4 100644 --- a/.github/ISSUE_TEMPLATE/general_issue.yml +++ b/.github/ISSUE_TEMPLATE/general_issue.yml @@ -24,17 +24,15 @@ body: label: Minecraft version description: What version of Minecraft are you using? options: - - 1.20.1 (Not yet released, manually compiled) - - 1.19.2 (Latest) - - 1.19.0 or 1.19.1 (No longer being developed) - - 1.18.x or earlier (No longer being developed) + - 1.20.1 (Latest) + - 1.19.x or earlier (No longer being developed) validations: required: true - type: input attributes: - label: Forge version - description: What version of Forge are you using? - placeholder: e.g. 43.2.8 + label: (Neo)Forge version + description: What version of (Neo)Forge are you using? (Please specify whether you are using Forge or NeoForge) + placeholder: e.g. 47.1.35 NeoForge validations: required: true - type: dropdown @@ -44,10 +42,7 @@ body: description: What version of Mekanism are you using? options: - Current Dev Branch (Manually Compiled) - - 10.3.9 (Latest) - - 10.3.8 - - 10.3.7 - - 10.3.6 + - 10.4.0 (Latest) - Older validations: required: true diff --git a/README.md b/README.md index 11e6389a985..c9321fd7fce 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,6 @@ world by using tier installers. After using Mekanism for a while, players can obtain a near-indestructible suit of Refined Obsidian Armor, receive five ingots for each ore mined, fly with hydrogen-powered jetpacks, and have cute robotic friends following them around while they mine. :) -# Alpha Status # - -Mekanism for 1.20 is currently in an alpha state. There may be crashes or game-breaking bugs, as well as, -the potential for us making breaking changes where APIs may change slightly or how data is saved to the world -changes. For this reason we do not recommend including Mekanism in any "large" packs that players may expect -things to work properly/upgrade safely from one version to the next. - # Discord # Mekanism has a [discord server](https://discord.gg/nmSjMGc) where you can chat with other Mekanism users and the developers. Join us! diff --git a/gradle.properties b/gradle.properties index 55d42fad353..8a730fd02ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,14 +11,14 @@ mappings_version=2023.09.03-1.20.1 mappings_channel=parchment loader_version_range=[47,) forge_version=47.1.76 -mod_version=10.3.9 +mod_version=10.4.0 #This determines the minimum version of forge required to use Mekanism # Only bump it whenever we need access to a feature in forge that is not available in earlier versions forge_version_range=[47.1.1,) minecraft_version_range=[1.20.1] #This specifies what type of release it will be uploaded to CurseForge and Modrinth as # options are: alpha, beta, release -release_type=alpha +release_type=release #JUnit/Testing dependencies junit_version=5.10.0 diff --git a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 index 23059841fda..b3a407de903 100644 --- a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 +++ b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 @@ -1,6 +1,6 @@ -// 1.20.1 2023-09-22T18:24:19.9543429 ComputerHelp: mekanism +// 1.20.1 2023-09-30T17:59:38.0985695 ComputerHelp: mekanism 94b6d2a203a16827e2f54f7489e90159992acdb3 data/mekanism/computer_help/enums.csv b38b847919651e2a55bc3eb8c719b2d92f76de7a data/mekanism/computer_help/enums.json -42b1cfb03dffcc9710f1f2109e63a84841180e0a data/mekanism/computer_help/jekyll.md +dcedcdca0558b37d0f2058357698fcdf84ec6db2 data/mekanism/computer_help/jekyll.md 2144f7ee4dfd00bfdfb7969c3497f22a4e841781 data/mekanism/computer_help/methods.csv 1bc03705513685d0612588d200070d7b8ba12bb7 data/mekanism/computer_help/methods.json diff --git a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md index 8fddfe81aa6..242d9e03d5e 100644 --- a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md +++ b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md @@ -4569,5 +4569,5 @@ methods: returns: javaType: boolean type: boolean -version: 10.3.9 +version: 10.4.0 --- diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index b44c8c2de30..3d327254638 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -48,7 +48,7 @@ public void onPlayerLoginEvent(PlayerLoggedInEvent event) { if (!player.level().isClientSide) { ServerPlayer serverPlayer = (ServerPlayer) player; Mekanism.packetHandler().sendTo(new PacketSecurityUpdate(), serverPlayer); - serverPlayer.sendSystemMessage(ALPHA_WARNING); + //serverPlayer.sendSystemMessage(ALPHA_WARNING); MekanismCriteriaTriggers.LOGGED_IN.trigger(serverPlayer); } }