From 6570d2351236b04bea140ddda78d94f31bed93d2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 4 Dec 2020 19:24:09 -0500 Subject: [PATCH] Fixed #3786 --- core/src/mindustry/core/Logic.java | 2 +- fastlane/metadata/android/en-US/changelogs/29753.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29755.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29757.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29759.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29761.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/29763.txt | 6 ++++++ gradle.properties | 2 +- 8 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29753.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29755.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29757.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29759.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29761.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29763.txt diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index a13e37cbac..cffe8415bf 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -123,7 +123,7 @@ public class Logic implements ApplicationListener{ }); //sync research - Events.on(ResearchEvent.class, e -> { + Events.on(UnlockEvent.class, e -> { if(net.server()){ Call.researched(e.content); } diff --git a/fastlane/metadata/android/en-US/changelogs/29753.txt b/fastlane/metadata/android/en-US/changelogs/29753.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29753.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/fastlane/metadata/android/en-US/changelogs/29755.txt b/fastlane/metadata/android/en-US/changelogs/29755.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29755.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/fastlane/metadata/android/en-US/changelogs/29757.txt b/fastlane/metadata/android/en-US/changelogs/29757.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29757.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/fastlane/metadata/android/en-US/changelogs/29759.txt b/fastlane/metadata/android/en-US/changelogs/29759.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29759.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/fastlane/metadata/android/en-US/changelogs/29761.txt b/fastlane/metadata/android/en-US/changelogs/29761.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29761.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/fastlane/metadata/android/en-US/changelogs/29763.txt b/fastlane/metadata/android/en-US/changelogs/29763.txt new file mode 100644 index 0000000000..19b92fc1cb --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29763.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Leaving sectors while guardians are present is now heavily penalized +- Made community servers sort by ping +- Changed "global items" to "total items" +- Added hint about core item incineration +- Made sector landing zones display on map when visible but not unlocked diff --git a/gradle.properties b/gradle.properties index 52a6f7d9e1..08dc44e774 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=d44cbae08716cfe97012c84399a1e61854d6b16c +archash=d9f2b846e51e511aa4985c32297f6cdc8552ca87