Merge branch 'master' into 1.12

This commit is contained in:
Tschipp 2017-10-01 19:29:01 +02:00
commit 2ea5ad18d3
2 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@ public class CarryOn {
public static CarryOn instance;
public static final String MODID = "carryon";
public static final String VERSION = "1.5.1_PRE";
public static final String VERSION = "1.6";
public static final String NAME = "Carry On";
public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/";
public static final Logger LOGGER = LogManager.getFormatterLogger("CarryOn");

View File

@ -2,7 +2,7 @@
{
"modid" : "carryon",
"name" : "Carry On",
"version" : "1.5.1", "mcversion" : "1.12",
"version" : "1.6", "mcversion" : "1.12",
"url" : "",
"credits" : "Tschipp, Purplicious_Cow, cy4n",
"authorList" : ["Tschipp, Purplicious_Cow, cy4n"],