mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 06:22:17 -08:00
Code Issues Projects Releases Wiki Activity
17743 commits 3 branches 175 tags 2.4 GiB
Commit graph

14780 commits

Author SHA1 Message Date
Anuken
efa5f8a2b5 Fixed #9973 2024-06-20 17:06:55 -04:00
Anuken
5376ea1f17 Merge remote-tracking branch 'origin/master' 2024-06-20 10:49:23 -04:00
Anuken
3e3a24794c Fixed #9957 2024-06-20 10:49:14 -04:00
summoner001
f3ddf659b3
Fixing mistakes (#9959) 
* Update bundle_hu.properties

Fix mistakes found by the Hungarian mindustry community.
Thanks to the community!

* Update bundle_hu.properties

One mistake what I found.
 2024-06-20 10:38:43 -04:00
Anuken
7a42cffa6d
Update LStatements.java 2024-06-17 07:40:30 -04:00
Synthwave84
9f40e8ca5e
Update bundle_ko.properties (#9909) 
Fixed some awkward sentences  

sector.basin.description part explanation was outdated 

{임시}\n\n현재의 마지막 지역. 이 지역은 도전 레벨입니다 - 이후 릴리즈에서 많은 지역이 더 추가될 예정입니다.

it refers {Temporary}\n\nThe last sector for now. Consider this a challenge level - more sectors will be added in a later release.

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-16 09:36:11 -04:00
Joan Josep
6b0702a805
Update bundle_ca.properties (#9950) 2024-06-16 09:33:51 -04:00
summoner001
16d37e19cf
Update bundle_hu.properties (#9951) 
* Update bundle_hu.properties

Translate the new strings and changes

* Update bundle_hu.properties

fix missing word from translate. Sorry

* Update bundle_hu.properties

minor fix
 2024-06-16 09:29:56 -04:00
SITUVNgcd
6b5541837c
Update Vietnamese translation (#9955) 
Translate new string: f26b03dc6c
Update exsiting string: 56b0deb910
 2024-06-16 09:29:48 -04:00
Redstonneur1256
58dbc5104f
Logic data instruction (#9935) 
* Logic `data` instruction

* Rename to `clientdata` & reliable option

* frog

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

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-16 09:29:35 -04:00
SITUVNgcd
7db512d2af
Remove duplicate space (#9954) 
Idk where it come from in orginal `bundle.properties` file.
 2024-06-16 09:28:25 -04:00
Anuken
56b0deb910 Removed @solid variable 2024-06-16 01:35:48 -04:00
Anuken
5c9e9e3ff4 Block solid sensor 2024-06-16 01:24:52 -04:00
Anuken
7f9eb87313 Logic icon support for all blocks 2024-06-16 01:11:54 -04:00
MEEPofFaith
5c23abf2d8
Add destination tile to block rotatedOutput (#9949) 
* Add destination to rotatedOutput

* Apply to GenericCrafter for output directions.

* Forgot to remove some logs
 2024-06-16 00:42:40 -04:00
Redstonneur1256
9f92a5ac06
Logic Refactor (#9940) 
* Replace logic variable indexes

* Fix `draw print`'s align

* Update core/src/mindustry/logic/LExecutor.java

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

* Remove duplicated variables

* Update core/src/mindustry/world/blocks/logic/LogicBlock.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-16 00:37:04 -04:00
Github Actions
ea239c6f60 Automatic bundle update 2024-06-16 04:35:29 +00:00
Jason
f26b03dc6c
Map rule for air spawns (#9922) 
* air use spawns

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add the rule

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add rule in ui

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* bundle

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* tie it to rules.waves

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* :)

Contributing.md says yes

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* indent

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
 2024-06-16 00:34:47 -04:00
Anuken
2d4d38990d Merge remote-tracking branch 'origin/master' 2024-06-13 21:59:35 -04:00
Anuken
a39b05ffc2 Scanner -> BufferedReader 2024-06-13 21:59:28 -04:00
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
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
84774a0a80
driving in masses (#9915) 2024-06-02 13:20:17 -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
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
4d2163d248 Less frequent Erekir turret retargeting when valid target is present 2024-05-27 18:12:21 -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
f51c6e458d Fixed unit shields breaking on spawn 2024-05-27 11:25:34 -04:00
Anuken
6243ef6d4a Fixed #9892 2024-05-27 09:40:52 -04:00
Anuken
f1f17965bc Fixed #9888 2024-05-26 09:31:40 -04:00
Anuken
f30b24f4ac Closes Anuken/Mindustry-Suggestions/issues/5012 2024-05-25 22:40:37 -04:00
Anuken
a0569a63bc Possible entity collision variable overwrite fix 2024-05-25 21:50:12 -04:00
summoner001
b6697d92cb
Update bundle_hu.properties (#9882) 
Translate the new lines from the "World processor list in editor" commit.
 2024-05-25 08:51:43 -04:00
Github Actions
ecfb5ede51 Automatic bundle update 2024-05-25 02:16:35 +00:00
Anuken
37dc449471 Processor list bugfixes 2024-05-24 22:02:37 -04:00
Anuken
b4b6b9fa44 World processor list in editor 2024-05-24 21:46:15 -04:00