Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,798 Commits 4 Branches 180 Tags
51dc58379b9f6d202fae6e91740df88f387fd31d
Commit Graph

14826 Commits

Author SHA1 Message Date
Mythril382
51dc58379b Merge branch 'master' into do-you-hear-the-voices-too 2024-07-06 12:12:51 +08:00
Github Actions
c91f51f8d2 Automatic bundle update 2024-07-06 01:43:24 +00:00
Anuken
04ec2c0603 Added toggle for always playing music 2024-07-05 21:42:23 -04:00
Anuken
76e24f7edc Merge remote-tracking branch 'origin/master' 2024-06-30 10:28:09 -04:00
Anuken
caf0ab581d Item deposit cooldown rule (default: 0.5 sec) 2024-06-30 10:28:01 -04:00
Github Actions
2ab2b03bf8 Automatic bundle update 2024-06-24 18:12:54 +00:00
Anuken
400db1b1e8 In-game rule edit dialog 2024-06-24 14:11:56 -04:00
Anuken
2a95b0f8d2 Nova tree build speed nerfs 2024-06-22 16:19:38 -04:00
Anuken
2357e8768b Boost unit rebuild/assist commands 2024-06-22 16:19:38 -04:00
Anuken
87584ebd0b Minor power graph optimization 2024-06-20 17:41:36 -04:00
Anuken
b5e8a2a865 Merge remote-tracking branch 'origin/master' 2024-06-20 17:07:02 -04:00
Anuken
efa5f8a2b5 Fixed #9973 2024-06-20 17:06:55 -04:00
Mythril382
94ebec4b6d should 2024-06-21 01:50:48 +08:00
Elixias
0019b78f71 Custom shield colouring (#9647) 
Five extra minutes I had the luxury of spending fixing Git because it exploded again

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-20 11:27:22 -04:00
RTOmega
7344abae49 TR Bundle Update (#9969) 
* Update bundle_tr.properties

* Update bundle_tr.properties
 2024-06-20 10:50:13 -04:00
Cubical box
93d2f60b56 Boss music for non-wave guardians (#9964) 
* why do I hear guardian music

* Update contributors

* format

* switch up

* switch up

* why

* no traces left behind
 2024-06-20 10:50:01 -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
Mythril382
07d20a8da5 refactor 1 2024-06-17 02:21:55 +08:00
Mythril382
f4882d6615 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-17 02:06:46 +08: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
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
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