mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-22 09:39:48 +00:00
Merge dev into scribe
Brings in the 1.11.2 version bump and the removal of the shutdown flush that did
not compile. The scribe branch was forked from 8612d444 to avoid that break, so
this is the first point at which it can track dev's tip again.
This commit is contained in:
commit
d6d6111803
3 files changed
+4
-4
No files matched your search
+1
-1
@@ -6,7 +6,7 @@ plugins {
|
||||
id "dts.typescript-generator"
|
||||
}
|
||||
|
||||
version = "1.11.1"
|
||||
version = "1.11.2"
|
||||
group= "kamkeel.customnpc-plus"
|
||||
archivesBaseName = "CustomNPC-Plus"
|
||||
|
||||
|
||||
+1
-1
@@ -199,7 +199,7 @@ disableCheckstyle = true
|
||||
# ideaCheckSpotlessOnBuild = true
|
||||
|
||||
# Non-GTNH properties
|
||||
modVersion = 1.11.1
|
||||
modVersion = 1.11.2
|
||||
|
||||
# Increase Gradle's JVM memory usage to avoid daemon expiration due to
|
||||
# insufficient heap space on CI builds.
|
||||
|
||||
@@ -125,7 +125,7 @@ import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11.1")
|
||||
@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.11.2")
|
||||
public class CustomNpcs {
|
||||
|
||||
@SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy")
|
||||
@@ -317,7 +317,7 @@ public class CustomNpcs {
|
||||
new AddonManager();
|
||||
new AttributeController();
|
||||
new MagicController();
|
||||
|
||||
|
||||
SyncController.register();
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user