1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-11 08:15:35 +03:00
Commit Graph

17765 Commits

Author SHA1 Message Date
Anuken
4c93a7fad4 Removed package in manifest 2024-07-06 17:14:10 -04:00
Anuken
aa645fe67c Updated Gradle and AGP to 8 2024-07-06 14:57:49 -04:00
Anuken
62df1e321d Fixed tests 2024-07-05 23:35:06 -04:00
Anuken
eb6c2c5640 Merge branch 'master' of https://github.com/Anuken/Mindustry 2024-07-05 22:05:07 -04:00
Anuken
e78bbb5fc2 testing builds 2024-07-05 22:05:03 -04: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
Tomoko
972e1a7704
Update servers_v7.json (#9972) 2024-06-20 11:27:40 -04: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
StalkerBaran
d897f1b7b0
Update servers_v7.json (#9960)
IP change (MeowIsland, fixed)
2024-06-20 11:21:04 -04:00
nowords123
d72b6586f3
Update servers_v7.json (#9967) 2024-06-20 11:20:37 -04:00
3MIDEV
cb225ba8f6
Update servers_v7.json (#9966) 2024-06-20 11:20:28 -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
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
TheRadioactiveBanana
2e460bf483
Need a few more ports (#9953) 2024-06-16 09:28:34 -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
router
92df8f9507
Update servers_v7.json (#9946)
* Update servers_v7.json

* i did not sleep for 19 hours
2024-06-16 00:38:41 -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
VNdustryComeback
fbbfaaa147
Update servers_v7.json (#9914)
i want add a server for Vietnam people lowest ping !

Co-authored-by: Anuken <arnukren@gmail.com>
2024-06-12 17:52:36 -04:00
lemon3357
609380dc7a
Update servers_v7.json (#9938) 2024-06-12 17:33:24 -04:00
Ayushkiller
9151c4af60
Update servers_v7.json (#9937) 2024-06-12 17:33:18 -04:00
Hahaa13
2f996ac4cb
Update servers_v7.json (#9936) 2024-06-12 17:33:12 -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
abcxyzDustry
885c173efe
Update servers_v7.json (#9932) 2024-06-12 17:32:34 -04:00