Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,370 Commits 4 Branches 180 Tags
2f6aefeb6f83017cff3a4e50622ebbd237993eed
Commit Graph

5551 Commits

Author SHA1 Message Date
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
Epowerj
9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
Epowerj
53ed4dd072 Tweaks to basin 2022-08-26 12:27:11 -04:00
RTOmega
80d772b96e TR Bundle Update (erekir units) (#7449) 
* TR Bundle Update

* güncerleme -> sürüm güncerlemesi

* Editor Translation Fix + Eleman -> Birim

* mini fixes

* Unit desc

* kumdan

* Update bundle_tr.properties
 2022-08-26 08:07:07 -04:00
Anuken
82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken
3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken
8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
Epowerj
9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Epowerj
8bc05be30e Tweaks on peaks :) 2022-08-25 01:13:34 -04:00
Epowerj
b8349bae19 Tweaks on peaks :) 2022-08-25 00:53:49 -04:00
Epowerj
94690b6edd Tweaks to marsh 2022-08-24 21:49:13 -04:00
Github Actions
7b63ec203e Automatic bundle update 2022-08-24 17:49:15 +00:00
Anuken
3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Github Actions
bef1b51ed2 Automatic bundle update 2022-08-24 14:39:08 +00:00
Anuken
eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
Epowerj
4ed4399e54 Progress on peaks 2022-08-23 23:09:43 -04:00
- MV -
f0300dcdde TRANSLATION (it) (#7381) 2022-08-23 08:33:46 -04:00
Anuken
976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Epowerj
9a0713523d Progress on peaks 2022-08-22 20:38:23 -04:00
Epowerj
14da646c57 Progress on peaks 2022-08-22 18:42:39 -04:00
Anuken
fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
Anuken
450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Anuken
57c07b7ebb More turret SFX 2022-08-21 23:53:07 -04:00
Anuken
f88ff59d49 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-21 20:44:12 -04:00
Anuken
2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
zenonet
dde9f895cf Added autoPause config for servers (#7405) 
* Extracted the method ServerControl.setPauseState()

* Added a comment to EventType.PlayerLeave

* Added the `pauseWithoutPlayers` config

* Revert "Extracted the method ServerControl.setPauseState()"

This reverts commit 45f5b01547.

* Renamed pauseWithoutPlayers to autoPause,
fixed manual- and automatic pausing to interfere
and made the server pause when hosting a new game

* Added a dot to the config description of `autoPause` and added my name to the contributors list

* Refactoring

* Merged remote-tracking changed I guess

* More refactoring

* More refactoring

* Removed logging about autoPause

* Removed another log I forgot in the last commit

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-21 10:32:58 -04:00
Rex Aliis
62a3f30755 Update contributors (#7406) 2022-08-21 10:31:41 -04:00
BlackDeluxeCat
cc3f14100d Fixed reactor light (#7385) 
* Fixed nuclear reactor light

* .
 2022-08-17 21:05:01 -04:00
ManuWar73
5a2ba71198 Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Github Actions
b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24
dff0a8294e Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions
03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄
1f57332091 Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas Widyantoko
287ccf7e84 Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan Josep
fd70598476 Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
K0baU
fe1d81b4d5 Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -04:00
Github Actions
522070be4b Automatic bundle update 2022-08-13 17:54:18 +00:00
Phinner
4030acbd75 Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Joan Josep
8132e1f3aa Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions
1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
Phinner
935d096b26 French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00
Github Actions
f3154d606b Automatic bundle update 2022-08-11 16:07:20 +00:00
Anuken
8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Github Actions
2f7a646e2b Automatic bundle update 2022-08-11 15:37:24 +00:00
Luna
e28dbfad69 Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Epowerj
ce8d51e18e Work on peaks 2022-08-10 10:52:59 -04:00
Github Actions
44af0bc08b Automatic bundle update 2022-08-10 02:51:16 +00:00