From d66a3b80ae96ef0412b19d75c3f518306f2c618f Mon Sep 17 00:00:00 2001
From: buthed010203 <naguiar010203@gmail.com>
Date: Sat, 17 Sep 2022 22:37:00 -0400
Subject: [PATCH 1/4] Fix javaPath not looking for .exe (#7590)

I never tested this on windows and finally decided to get to the bottom of all the weird reports ive been getting
---
 core/src/mindustry/Vars.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index a6b71198a9..4abe276b01 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -316,7 +316,8 @@ public class Vars implements Loadable{
         logicVars = new GlobalVars();
         javaPath =
             new Fi(OS.prop("java.home")).child("bin/java").exists() ? new Fi(OS.prop("java.home")).child("bin/java").absolutePath() :
-            Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() :
+            Core.files.local("jre/bin/java").exists() ? Core.files.local("jre/bin/java").absolutePath() : // Unix
+            Core.files.local("jre/bin/java.exe").exists() ? Core.files.local("jre/bin/java.exe").absolutePath() : // Windows
             "java";
 
         state = new GameState();

From e319f75c818f9378f91ed8ab47bace2888e7f3b5 Mon Sep 17 00:00:00 2001
From: GTMZ <113624426+GTMZOMEAGEAmazon@users.noreply.github.com>
Date: Sun, 18 Sep 2022 09:37:14 +0700
Subject: [PATCH 2/4] editing ip address! (#7588)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 981c0b575f..7345f4a096 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -122,6 +122,6 @@
   },
   {
     "name": "LightDustry",
-    "address": ["lightdustry.ddns.net:28583", "lightdustry.ddns.net:6567", "lightdustry.ddns.net:6568"]
+    "address": ["lightdustry.ddns.net:28583", "lightdusy.ddns.net:6567", "lightdusy.ddns.net:6568"]
   }
 ]

From bc53275c5010628ef60493605fd6f97175a428ce Mon Sep 17 00:00:00 2001
From: Volas171 <volas@mindustry.me>
Date: Sun, 18 Sep 2022 06:50:11 -0500
Subject: [PATCH 3/4] EradicationDustry V7 Extreme PVP (#7592)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 7345f4a096..1b1c13b1e4 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -110,7 +110,7 @@
   },
     {
     "name": "Eradicationdustry",
-    "address": ["n1.yeet.ml:6577", "n1.yeet.ml:6576", "n1.yeet.ml:6602", "n1.yeet.ml:6669", "eradicationmindustry.yeet.ml:9547"]
+    "address": ["n1.yeet.ml:6577", "n1.yeet.ml:6576", "n1.yeet.ml:6602", "n1.yeet.ml:6669", "eradicationmindustry.yeet.ml:9547", "n1.yeet.ml:6593"]
   },
     {
     "name": "AlternightBrasil",

From 991d98b7189b2135e800850335b68ee5ae718c97 Mon Sep 17 00:00:00 2001
From: Mythril382 <77225817+Mythril382@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:50:27 +0800
Subject: [PATCH 4/4] add a `display` field to weapons just like abilities
 (#7591)

* weapo

* that
---
 core/src/mindustry/type/Weapon.java              | 4 +++-
 core/src/mindustry/type/weapons/BuildWeapon.java | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 0edd2387d0..6870046bd9 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -31,6 +31,8 @@ public class Weapon implements Cloneable{
     public BulletType bullet = Bullets.placeholder;
     /** shell ejection effect */
     public Effect ejectEffect = Fx.none;
+    /** whether weapon should appear in the stats of a unit with this weapon */
+    public boolean display = true;
     /** whether to consume ammo when ammo is enabled in rules */
     public boolean useAmmo = true;
     /** whether to create a flipped copy of this weapon upon initialization. default: true */
@@ -147,7 +149,7 @@ public class Weapon implements Cloneable{
     }
 
     public boolean hasStats(UnitType u){
-        return true;
+        return display;
     }
 
     public void addStats(UnitType u, Table t){
diff --git a/core/src/mindustry/type/weapons/BuildWeapon.java b/core/src/mindustry/type/weapons/BuildWeapon.java
index 4ca1e55483..40bfa667e1 100644
--- a/core/src/mindustry/type/weapons/BuildWeapon.java
+++ b/core/src/mindustry/type/weapons/BuildWeapon.java
@@ -22,14 +22,10 @@ public class BuildWeapon extends Weapon{
         rotate = true;
         noAttack = true;
         predictTarget = false;
+        display = false;
         bullet = new BulletType();
     }
 
-    @Override
-    public boolean hasStats(UnitType u){
-        return false;
-    }
-
     @Override
     public void update(Unit unit, WeaponMount mount){
         mount.shoot = false;