mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 00:49:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,798 Commits 4 Branches 160 Tags 2.3 GiB
51dc58379b
Commit Graph

17798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mythril382
b1e683a963
JSON Stuff (#9933) 
* why is everything-

* don't shrink

* they're different????????

* varabel

* i cannot ignore it

* check

* a

* missing ops
 2024-06-12 17:32:53 -04:00
abcxyzDustry
885c173efe
Update servers_v7.json (#9932) 2024-06-12 17:32:34 -04:00
Natrition
b06b047849
Update servers_v7.json (#9927) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2024-06-12 17:32:28 -04:00
Github Actions
afc1204030 Automatic bundle update 2024-06-12 21:31:28 +00:00
Prosta4okua
8dc71df904
[READY_TO_MERGE] Ukrainian translation (#9924) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

Heat Router: відсутній переклад назви.

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2024-06-12 17:30:37 -04:00
Anuken
d8e5818a45 Merge remote-tracking branch 'origin/master' 2024-06-08 12:55:11 -04:00
Anuken
f0bee7f19f Pathfinder bugfixes 2024-06-08 12:55:04 -04:00
Anuken
197fbbf46e multi-chooser fix 2024-06-02 16:26:36 -04:00
Anuken
1fc83e6b0f Merge branch 'master' of https://github.com/Anuken/Mindustry 2024-06-02 16:11:33 -04:00
Anuken
a7aa600ed6 Native multi file chooser 2024-06-02 16:11:29 -04:00
Mythril382
0397d3bf89
Merge branch 'master' into do-you-hear-the-voices-too 2024-06-03 02:15:36 +08:00
Mythril382
84774a0a80
driving in masses (#9915) 2024-06-02 13:20:17 -04:00
Mythril382
30480a6eda
wack 2024-06-02 16:18:43 +08:00
Natrition
af6db8d092
Update servers_v7.json (#9912) 2024-06-01 18:37:15 -04:00
Brandán
d17a861e30
Update bundle_es.properties (#9766) 
* Create bundle_gl.properties

* Update bundle_es.properties

Translated some stuff here and there

* Delete core/assets/bundles/bundle_gl.properties
 2024-06-01 09:33:17 -04:00
Mina Her
0d3879ad96
Update Korean translations (#9773) 
* Update Korean translations for Phase Fabric

Phase Fabric:
  메타 (Meta) → 위상 섬유 (Phase Fabric)
Phase Wall:
  메타 벽 (Meta Wall) → 위상 벽 (Phase Wall)
Phase Weaver:
  메타 제조기 (Meta Generator) → 위상 방직기 (Phase Weaver)
Phase Converyor:
  메타 컨베이어 (Meta Conveyor) → 위상 컨베이어 (Phase Conveyor)
Phase Conduit:
  메타 파이프 (Meta Pipe) → 위상 파이프 (Phase Pipe)
Phase Heater:
  메타 가열기 (Meta Heater) → 위상 가열기 (Phase Heater)
Phase Synthesizer:
  메타 합성기 (Meta Synthesizer) → 위상 합성기 (Phase Synthesizer)

* Update Korean translations for Surge Alloy

Surge Alloy:
  설금 (???[Seolgeum]) → 서지 합금 (Surge Alloy)
Surge Tower:
  설금 타워 (???[Seolgeum] Tower) → 서지 타워 (Surge Tower)
Surge Smelter:
  설금 제련소 (???[Seolgeum] Smelter) → 서지 제련소 (Surge Smeltor)
Surge Wall:
  설금 벽 (???[Seolgeum] Wall) → 서지 벽 (Surge Wall)
Surge Crucible:
  설금 도가니 (???[Seolgeum] Crucible) → 서지 도가니 (Surge Crucible)
Surge Conveyor:
  설금 컨베이어 (???[Seolgeum] Conveyor) → 서지 컨베이어 (Surge Conveyor)
Surge Router:
  설금 분배기 (???[Seolgeum] Distributor) → 서지 분배기 (Surge Distributor)

* Update Korean translations for reconstructors
 2024-06-01 09:32:57 -04:00
CuteMiao Xuwen
36779c4aaa
Update servers_v7.json (#9910) 2024-06-01 09:32:12 -04:00
CoCo
e23602f580
Update Name (#9904) 
I have changed my name recently and so it's up-to-date.
 2024-05-31 09:31:28 -04:00
Github Actions
38ca9c8bf1 Automatic bundle update 2024-05-30 22:21:36 +00:00
SITUVNgcd
cf0efdd04f
Double-check translations for Vietnamese (#9887) 
With the help of Crowdin, instead of Text editor which very hard to check side by side (en & vi), i'm double checked every strings for:
- Mis-translation.
- Typo.
- New sentences for some strings.
- Synced some translations. e.g. `wave` => `đợt` (other one is `lượt`)...
- Translated new string from world processor in editor commit (ecfb5ede51)

All turret's and unit's names are remain as orginal ones, like previous translations. I don't know if i should translate them, but in other languages, they were translated.
 2024-05-30 18:18:52 -04:00
Anuken
8944b08fbf Fixed map load dialog 2024-05-27 21:45:23 -04:00
Anuken
05c2d47d51 Invert 2024-05-27 18:25:39 -04:00
Anuken
a76f70f3a6 Merge remote-tracking branch 'origin/master' 2024-05-27 18:12:29 -04:00
Anuken
4d2163d248 Less frequent Erekir turret retargeting when valid target is present 2024-05-27 18:12:21 -04:00
Tatarinyon
c0c68ddad1
Update servers_v7.json (#9889) 
* Update servers_v7.json

Yes, eventually I want to add my server and I think it will be the first server added from Turkey. Currently there are only classic maps on the server. I will make maps for the server in my spare time

* Update servers_v7.json
 2024-05-27 18:01:16 -04:00
Anuken
a260710ee6 MacOS file chooser fix 2024-05-27 17:57:34 -04:00
Anuken
6e7613dee3 Fixes 2024-05-27 17:34:34 -04:00
Anuken
9ac8d9a821 Fixes 2024-05-27 17:29:04 -04:00
Anuken
e7d7890891 Fixes 2024-05-27 17:27:40 -04:00
Anuken
bf1b4f9af5 Native file chooser, untested 2024-05-27 17:23:46 -04:00
Mythril382
41e2183793
Merge branch 'master' into do-you-hear-the-voices-too 2024-05-28 00:40:31 +08:00
Mythril382
5e3ee08c2c
remove that 2024-05-28 00:38:05 +08:00
Mythril382
0067af0e2c
changes 2024-05-28 00:31:00 +08:00
Anuken
ba2191a186 Merge remote-tracking branch 'origin/master' 2024-05-27 11:25:41 -04:00
Anuken
f51c6e458d Fixed unit shields breaking on spawn 2024-05-27 11:25:34 -04:00
Mythril382
ff35e6a7d8
mythril that's a seq, NOT an objectmap 2024-05-27 23:13:43 +08:00
Mythril382
dbb62bd87c
nullcheck 2024-05-27 23:10:07 +08:00
router
511c187029
Update servers_v7.json (#9893) 2024-05-27 10:03:18 -04:00
Anuken
6243ef6d4a Fixed #9892 2024-05-27 09:40:52 -04:00
Mythril382
580d35cf1e
the arc pr 2024-05-27 12:54:27 +08:00
Mythril382
d24f031cb4
it's 4:14, i should sleep 
anuke was right, this is a mess
 2024-05-27 04:13:35 +08:00
Mythril382
ce56c1df18
it is 3:40 am right now 2024-05-27 03:39:50 +08:00
Mythril382
7f80a1879e
sound id 2024-05-27 03:35:37 +08:00
Mythril382
bc2be5de25
Delete core/src/mindustry/logic/LogicSound.java 2024-05-27 02:10:12 +08:00
Anuken
f1f17965bc Fixed #9888 2024-05-26 09:31:40 -04:00
Anuken
617d5581e0 Merge remote-tracking branch 'origin/master' 2024-05-25 22:40:46 -04:00
Anuken
f30b24f4ac Closes Anuken/Mindustry-Suggestions/issues/5012 2024-05-25 22:40:37 -04:00
prof-milki
41516dbda7
Update servers_v7.json: factory server (#9868) 
New server instance, Europe, static IPv6-only, single game mode (for now).
 2024-05-25 22:09:29 -04:00
Anuken
a0569a63bc Possible entity collision variable overwrite fix 2024-05-25 21:50:12 -04:00
Anuken
0a1c10192e Merge remote-tracking branch 'origin/master' 2024-05-25 21:30:53 -04:00