mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-06 06:01:02 -07:00
Code Issues Projects Releases Wiki Activity

Revert "Repurpose branch to be played"

Browse source 
This reverts commit ff578c8540.

# Conflicts:
#	tools/crater-deploy.sh
This commit is contained in:
Patrick 'Quezler' Mounier 2020-03-05 10:10:00 +01:00
parent 9bc340ba17
commit 9df875354a
No known key found for this signature in database
GPG key ID: 0D6CA7326C76D8EA
4 changed files with 1 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/Vars.java
View file

@ -59,8 +59,6 @@ public class Vars implements Loadable{
public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json";
/** URL to the JSON file containing all the BE servers. Only queried in BE. */
public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
/** URL to the JSON file containing all the crater servers. */
public static final String serverJsonCraterURL = "https://raw.githubusercontent.com/Quezler/Mindustry/craters/servers_crater.json";
/** URL of the github issue report template.*/
public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md";
/** list of built-in servers.*/

2
core/src/mindustry/ui/dialogs/JoinDialog.java
View file

@ -427,7 +427,7 @@ public class JoinDialog extends FloatingDialog{
servers = Core.settings.getObject("server-list", Array.class, Array::new);
//get servers
Core.net.httpGet(serverJsonCraterURL, result -> {
Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonURL, result -> {
try{
Jval val = Jval.read(result.getResultAsString());
Core.app.post(() -> {