Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,298 Commits 4 Branches 180 Tags
dbf79020469590313c7732b9c8c73687a59bc680
Commit Graph
5528 Commits
Author SHA1 Message Date
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
zenonetGitHubAnuken
 		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 AliisandGitHub 62a3f30755 Update contributors (#7406) 2022-08-21 10:31:41 -04:00
BlackDeluxeCatandGitHub cc3f14100d Fixed reactor light (#7385) 
* Fixed nuclear reactor light

* .
 2022-08-17 21:05:01 -04:00
ManuWar73andGitHub 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-24GitHubAnuken
 		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
彭瑞暄andGitHub 1f57332091 Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas WidyantokoandGitHub 287ccf7e84 Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan JosepandGitHub fd70598476 Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
K0baUandGitHub 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
PhinnerGitHubAnuken
 		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 JosepandGitHub 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
PhinnerandGitHub 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
LunaandGitHub 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
ThatOneBepisandGitHub 0fa21ce165 Previous "update bundle_sr.properties" but no Sine shenanigans (#7333) 
* Update bundle_sr.properties

* ln but with angles

* rollback

* you saw nothing
 2022-08-09 22:50:14 -04:00
Epowerj 1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj bc38d71f98 Progress on peaks 2022-08-09 16:52:36 -04:00
Epowerj 9f9e854c5f Progress on peaks 2022-08-09 16:47:13 -04:00
Github Actions 75b5efd5e2 Automatic bundle update 2022-08-09 20:03:27 +00:00
NuntingandGitHub a31175377a Update bundle_ko.properties (#7307) 
* Update bundle_ko.properties

Unification of reactor terms. 
원자로 -> 반응로 통일. 같은 의미이지만 어감이 다름.

Added detailed description of parallax for beginners. This is not official and can be removed at any time.
초보자를 위한 패럴랙스 디테일 추가. 공식 설명이 아니므로 제거될 수 있음.

* Update bundle_ko.properties

토륨/핵융합 반응로->원자로로 복원
 2022-08-09 16:02:28 -04:00
SUSandGitHub f01278cf72 Update bundle_uk_UA.properties (#7318) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)

* Update bundle_uk_UA.properties

Start...

* Update bundle_uk_UA.properties

1

* Update bundle_uk_UA.properties

2

* Update bundle_uk_UA.properties

3.1

* Update bundle_uk_UA.properties

4

* Update bundle_uk_UA.properties

5

* Update bundle_uk_UA.properties

6

* Update bundle_uk_UA.properties

7

* Update bundle_uk_UA.properties

8

* Update bundle_uk_UA.properties

Finally (I'm waiting)
 2022-08-09 16:02:19 -04:00
Epowerj 48cb99774a Added peaks 2022-08-09 15:46:32 -04:00
Epowerj 901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
彭瑞暄andGitHub af503d1a50 Update bundle_zh_TW.properties (#7190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2022-08-07 21:38:00 -04:00
Epowerj 4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -04:00
Epowerj 33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj 605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -04:00
Epowerj dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Epowerj 4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Epowerj aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Joan JosepandGitHub 275293e45c Update bundle_ca.properties (#7301) 
* Update bundle_ca.properties

* Update bundle_ca.properties
 2022-08-05 15:09:05 -04:00
Github Actions 031ca650bd Automatic bundle update 2022-08-05 18:27:32 +00:00
Thomas WidyantokoandGitHub e3c4bd86db [ID] id_ID bundle update (#7175) 
* [ID] various bundle update

+ Mod Browser release, some editor functions, sector four description, and more

* quick bundle update

sector, block, logic descriptions and other fixes
will continue again later my house is being renovated bruh

* finalizing v7 alpha id_ID translation

turrets are now translated, adjusted stats and status to match its function, and stuff

* added heat source to id_ID

...and other new things i guess

* adds new lines from EN bundle to id_ID

includes Neoplasia Reactor and other fixes

also things changed a lot behind the scenes
 2022-08-05 14:26:38 -04:00
Epowerj d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -04:00
Epowerj 1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00