mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-18 03:37:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

Switching modifier from beta to release

Browse Source
This commit is contained in:
Anuken
2020-11-28 13:57:19 -05:00
parent 98206446e6
commit e6544b73db
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -32,7 +32,7 @@ allprojects{
ext{ ext{
versionNumber = '6' versionNumber = '6'
if(!project.hasProperty("versionModifier")) versionModifier = 'beta' if(!project.hasProperty("versionModifier")) versionModifier = 'release'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256' steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'

2
core/src/mindustry/mod/Mods.java
View File

@ -247,7 +247,7 @@ public class Mods implements Loadable{
mods.add(mod); mods.add(mod);
}catch(Throwable e){ }catch(Throwable e){
if(e instanceof ClassNotFoundException && e.getMessage().contains("mindustry.plugin.Plugin")){ if(e instanceof ClassNotFoundException && e.getMessage().contains("mindustry.plugin.Plugin")){
Log.info("Plugin @ is outdated and needs to be ported to 6.0! Update its main class to inherit from 'mindustry.mod.Plugin'."); Log.info("Plugin @ is outdated and needs to be ported to 6.0! Update its main class to inherit from 'mindustry.mod.Plugin'. See https://mindustrygame.github.io/wiki/modding/6-migrationv6/");
}else{ }else{
Log.err("Failed to load mod file @. Skipping.", file); Log.err("Failed to load mod file @. Skipping.", file);
Log.err(e); Log.err(e);

2
core/src/mindustry/type/Weapon.java
View File

@ -13,7 +13,7 @@ import mindustry.io.*;
public class Weapon{ public class Weapon{
/** displayed weapon region */ /** displayed weapon region */
public String name; public String name = "";
/** bullet shot */ /** bullet shot */
public BulletType bullet; public BulletType bullet;
/** shell ejection effect */ /** shell ejection effect */

2
core/src/mindustry/world/meta/values/WeaponListValue.java
View File

@ -29,7 +29,7 @@ public class WeaponListValue implements StatValue{
continue; continue;
} }
TextureRegion region = weapon.outlineRegion.found() ? weapon.outlineRegion : unit.icon(Cicon.full); TextureRegion region = !weapon.name.equals("") && weapon.outlineRegion.found() ? weapon.outlineRegion : unit.icon(Cicon.full);
table.image(region).size(60).scaling(Scaling.bounded).right().top(); table.image(region).size(60).scaling(Scaling.bounded).right().top();

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=2d451f0c342755ef84e609c951a8fca654ef41b5 archash=f99aa02b0def1951452b67263439977d1d485ae7