16374 Commits
Author SHA1 Message Date
AnukenandGitHub 2990972130 Merge pull request #3271 from DaGamerFiles/patch-3
Update bundle_in_ID.properties
2020-11-11 09:48:13 -05:00
AnukenandGitHub ec956ae5f3 Merge pull request #3332 from jimmy927/master
Better and more complete swedish translations.
2020-11-11 09:42:15 -05:00
AnukenandGitHub da3572a900 Merge pull request #3315 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-11 09:42:03 -05:00
AnukenandGitHub e48dc2ea5e Merge pull request #3259 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-11 09:41:24 -05:00
Anuken 4f4f8f08bb arc 2020-11-11 09:28:28 -05:00
Anuken d1d793b16c Merge remote-tracking branch 'origin/master' 2020-11-11 09:28:28 -05:00
Anuken 12843af977 Cleanup 2020-11-11 09:28:17 -05:00
AnukenandGitHub d10960817d Merge pull request #3335 from DeltaNedas/error
add more info to schematic errors
2020-11-10 18:47:37 -05:00
DeltaNedas 6ba0bfe06a h 2020-11-10 23:33:53 +00:00
Anuken 887ce28fc2 Fix for render mocking 2020-11-10 18:16:18 -05:00
Anuken ac4f2cac32 Merge remote-tracking branch 'origin/master' 2020-11-10 18:13:53 -05:00
Anuken f089f2c2ff Bugfixes 2020-11-10 18:13:49 -05:00
DeltaNedas 71ae9e1274 add more info to schematic errors 2020-11-10 22:46:57 +00:00
AnukenandGitHub 9822b6c67a Merge pull request #3334 from buthed010203/patch-2
Small grammar fix
2020-11-10 17:37:34 -05:00
buthed010203andGitHub ed374509b2 Small grammar fix
Its bothering me ok
2020-11-10 17:20:24 -05:00
AnukenandGitHub dbd677efed Merge pull request #3333 from buthed010203/patch-1
Fix bleeding edge updater
2020-11-10 17:04:33 -05:00
buthed010203andGitHub c9670abff7 Fix bleeding edge updater
The updater previously didn't update the original jar that was launched due to the use of the wrong function lol
2020-11-10 16:19:07 -05:00
Thomas WidyantokoandGitHub 0ec8bcc778 Merge pull request from Quick-korkc
Item and building details translate
2020-11-11 04:02:38 +07:00
Jimmy Engelbrecht 89788d1fa8 Better and more complete swedish translations. 2020-11-10 21:13:07 +01:00
Anuken 8d3df82f81 arc 2020-11-10 14:54:49 -05:00
Anuken 002265f911 arc 2020-11-10 14:54:46 -05:00
Anuken 2d7562255a More sector overview visual changes 2020-11-10 14:54:07 -05:00
Anuken e68eda3e58 Merge remote-tracking branch 'origin/master' 2020-11-10 13:48:05 -05:00
Anuken ddc2cc7098 New preset / Indication of vulnerable sectors 2020-11-10 13:47:55 -05:00
AnukenandGitHub 26d8fe0a56 Update gradle.yml 2020-11-10 09:47:49 -05:00
Anuken f0c4ebfd31 Removed LCategory 2020-11-10 08:57:30 -05:00
VanguardandGitHub a723edb2e1 4 new lines; 3 line changed; 1 line removed
New:
servers.showhidden
server.shown
server.hidden
ability.movelightning

Changed:
boss.health
block.overflow-gate.description
block.underflow-gate.description

Removed:
block.launch-pad-large.description
2020-11-10 15:56:56 +03:00
YellOw139andGitHub a209933307 new (humming) strings 2020-11-10 12:50:30 +02:00
Leonwang4234 3a27e6e94e Merge remote-tracking branch 'upstream/master' into unit-stats 2020-11-09 21:52:42 -08:00
Anuken ebdced5c6c Merge remote-tracking branch 'origin/master' 2020-11-09 19:15:51 -05:00
Anuken 5eb4d25fe9 Fixed #3320 2020-11-09 19:15:37 -05:00
AnukenandGitHub eeb540409a Merge pull request #3319 from MEEPofFaith/patch-1
Add Movement Lightning to bundle
2020-11-09 18:51:15 -05:00
MEEP of FaithandGitHub 742cac3e75 Add Movement Lightning to bundle 2020-11-09 15:50:01 -08:00
AnukenandGitHub e1541b8c06 Merge pull request #3275 from PAP6/patch-1
New 6.0 server(Now with DDNS)
2020-11-09 18:44:23 -05:00
Anuken 89589c3258 Converted music to mp3 / New tracks / Minor cleanup 2020-11-09 17:02:36 -05:00
Anuken 29c6d7fe6c arc 2020-11-09 14:41:35 -05:00
Anuken fe27ac6aec Testing mp3 sounds + hiding servers 2020-11-09 14:33:28 -05:00
VanguardandGitHub 74ba9ca04f 1 line reverted (I don't remember this change)
schematic.exportfile
2020-11-09 21:54:59 +03:00
Anuken 43e6da0fed Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-11-09 12:45:34 -05:00
AnukenandGitHub 2ae9be6335 Merge pull request #3284 from skykatik/cleanup-2
Cleanup
2020-11-09 12:38:02 -05:00
Anuken 548dc79fb0 Beginning work on grouped servers 2020-11-09 12:34:34 -05:00
SkatandGitHub f84e780f3b Merge branch 'master' into cleanup-2 2020-11-09 20:21:01 +04:00
Anuken acb14a0986 Bugfixes 2020-11-09 10:40:02 -05:00
Quick-KorcandGitHub bd0f155f75 Item and building details translate
Note : details is not description
2020-11-09 19:06:38 +07:00
Thomas WidyantokoandGitHub dfc5923ca4 unnecessary "-mu" 2020-11-09 18:18:37 +07:00
Thomas WidyantokoandGitHub ea22c5cc12 Kepingan (Scrap) -> Rongsokan 2020-11-09 18:17:01 +07:00
YellOw139andGitHub eebc39668c Engmanian fixes/improvements 2020-11-09 10:47:39 +02:00
Anuken 2d4f4015b1 Fixed mono presence "corrupting" older saves 2020-11-08 20:24:31 -05:00
Leonwang4234 e9c00d8a9f remove unused imports 2020-11-08 17:23:05 -08:00
Anuken 23403d0c51 Fixed #3300 2020-11-08 19:54:27 -05:00