mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,959 Commits 4 Branches 160 Tags 2.3 GiB
7a71db26b6
Commit Graph

14936 Commits

Author SHA1 Message Date
SITUVNgcd
a336dc74a7
Update Vietnamese translation (#10079) 
New string and changes from 0b0db7bab2
 2024-08-03 09:23:45 -04:00
Mythril382
e0c455bca8
Allow Mods To Modify RegionPart's Heat Light Region (#10048) 
* actually work

* betterize

i think
 2024-08-03 00:53:45 -04:00
Github Actions
0b0db7bab2 Automatic bundle update 2024-08-03 04:52:20 +00:00
Anuken
27f20b7a36 Better implementation of #10047 2024-08-03 00:51:31 -04:00
Anuken
e7759989e5 Description rewording 2024-08-03 00:20:18 -04:00
Anuken
571e788170 Fixed sound instruction layout 2024-08-03 00:17:54 -04:00
Anuken
345d710b4b Merge branch 'do-you-hear-the-voices-too' of https://github.com/Mythril382/Mindustry into logic-sound-2 2024-08-03 00:02:50 -04:00
Anuken
52d10f11f8 Cleanup 2024-08-02 23:59:21 -04:00
Anuken
9b301b272e Merge remote-tracking branch 'origin/master' 2024-08-02 23:57:10 -04:00
Anuken
7671766469 Beam node link previews, closes Anuken/Mindustry-Suggestions/issues/5140 2024-08-02 23:57:03 -04:00
Joan Josep
8b24030d7a
Update bundle_ca.properties (#10074) 2024-08-02 16:53:32 -04:00
summoner001
c7154f9460
Update bundle_hu.properties (#10071) 
* Update bundle_hu.properties

Make the translation of the "tile" word coherent so that it has the same translation everywhere, because several translations have been used for it, which can confuse the player.

Minor sentence fixes.

* Update bundle_hu.properties

Make sentence understandable.

* Update bundle_hu.properties

Fix sentence.
 2024-08-02 16:53:17 -04:00
WayZer
daa493c0b1
Why write Pool don't write reset (#10066) 2024-07-30 14:04:02 -04:00
summoner001
57ddf4fc46
Update bundle_hu.properties (#10065) 
Make the translation of the "launch" word coherent so that it has the same translation everywhere, because several translations have been used for it, which can confuse the player.

Minor sentence fixes.
 2024-07-28 09:51:08 -04:00
Anuken
1f900b52f8 Afflict building damage nerf 2024-07-26 23:44:37 -04:00
Anuken
62ec52e110 Merge remote-tracking branch 'origin/master' 2024-07-26 23:29:38 -04:00
Anuken
0de1bec554 Fixed #10046 2024-07-26 23:29:28 -04:00
summoner001
733f12a605
Update bundle_hu.properties (#10060) 
* Update bundle_hu.properties

Fixing statistics texts. Formatted to the size of the in-game text box. Now the text does not slip in the game. Tested.

* Update bundle_hu.properties

Minor translation fix.

* Update bundle_hu.properties

correct a meaningless sentence

* Update bundle_hu.properties

correct sentence

* Update bundle_hu.properties

Use of the same words for flying units.
 2024-07-26 22:38:59 -04:00
Anuken
3a1a06e57f Fixed #10051 2024-07-26 22:30:12 -04:00
Anuken
e604c3b098 Clean tiles on reset 2024-07-26 22:23:01 -04:00
Anuken
5ac90d6ed3 Minor power node optimizations 2024-07-23 11:55:09 -04:00
Anuken
a594d796ad Batch optimizations 2024-07-23 11:31:34 -04:00
Anuken
995014cbe4 Cleanup 2024-07-23 07:26:17 -04:00
Anuken
6e5b1e81ae Crash fix 2024-07-23 07:21:05 -04:00
Anuken
0425408e75 Merge remote-tracking branch 'origin/master' 2024-07-21 07:53:41 -04:00
Anuken
0a224c52b4 Fixed #10042 2024-07-21 07:53:34 -04:00
Github Actions
047aa4fdaa Automatic bundle update 2024-07-19 23:17:59 +00:00
summoner001
cc9a3d53d9
Update bundle_hu.properties (#10036) 
Minor fixes.
 2024-07-19 19:17:02 -04:00
Joan Josep
f7d91eb8c9
Update bundle_ca.properties (#10032) 2024-07-19 19:16:52 -04:00
Anuken
10e1680d3b Fixed #10039 2024-07-19 19:07:10 -04:00
Anuken
394ed99616 More item request validation 2024-07-18 10:04:36 -04:00
Anuken
f6c240262d Fixed incorrect RailBullet length with pierceCap 2024-07-16 17:53:27 -04:00
Anuken
2f1f334d65 Turret ammo sync 2024-07-16 14:17:10 -04:00
Anuken
afc8d5e396 Possible stack conveyor freeze fix (3) 2024-07-15 10:45:32 -04:00
Anuken
dac74f3022 Possible stack conveyor freeze fix (2) 2024-07-15 10:25:47 -04:00
Anuken
13a4179893 Merge remote-tracking branch 'origin/master' 2024-07-15 10:24:36 -04:00
Anuken
2a95f1fe16 Possible stack conveyor freeze fix 2024-07-15 10:24:30 -04:00
Sh1p*nfire
5a493c0338
Update CoreBlock.java (#10025) 
Allows destroyBullet to work on coreBlock.
 2024-07-13 10:30:36 -04:00
summoner001
ca8a4e1e4f
Update bundle_hu.properties (#10013) 
* Update bundle_hu.properties

Translating to hungarian of the new strings.

* Update bundle_hu.properties

* Update bundle_hu.properties
 2024-07-12 13:19:16 -04:00
Anuken
2075e22ef1 Fixed #10020 2024-07-12 13:15:12 -04:00
Anuken
295573142f Removing Nulls.unit 2024-07-10 16:40:32 -04:00
Anuken
e3ba8b714b Crash fix 2024-07-10 15:28:43 -04:00
Anuken
92e121c05c Fixed unit part progress with multiple weapons 2024-07-10 13:24:03 -04:00
Anuken
07738cbac6 Fixed #10010 2024-07-07 20:17:14 -04:00
Anuken
d8dc9c7c98 Merge remote-tracking branch 'origin/master' 2024-07-07 20:14:16 -04:00
Anuken
76456d6f0e Fixed #10011 2024-07-07 20:14:08 -04:00
SITUVNgcd
e3f9e19f13
Update Vietnamese translation (#10008) 
41aea39a80
 2024-07-07 12:58:51 -04:00
Anuken
cd298edfe7 Unused variable removed 2024-07-07 12:22:12 -04:00
SomeonesShade
a184abb117
Flux Power and Heat Capacity Increase (#9500) 2024-07-07 11:52:58 -04:00
MEEPofFaith
c193206ccb
Modded payload factory sprites (#8595) 
* Search for modded payload factory blocks

* Generate payload mass driver outlines in mods

* Revert weird change

* Revert "Revert weird change"

This reverts commit 0afd64077a.
 2024-07-07 11:42:45 -04:00
MEEPofFaith
4a456645d3
ConsumeItemList (#9947) 
* ConsumeItemList

* Add to ContentParser

* Add efficiency multipliers

* Untested adding to ObjectIntMap and ObjectFloatMap

* Use a single map
 2024-07-07 11:38:21 -04:00
Anuken
0021f98335
Merge branch 'master' into do-you-hear-the-voices-too 2024-07-07 11:31:09 -04:00
Github Actions
41aea39a80 Automatic bundle update 2024-07-07 15:29:11 +00:00
TripleToxic
82bcf5966e
Sensors, SetProp, and SetRule (#9943) 
* some fun things for world proc only

* fix the format artifact

* SetProp and reformating

* Wildcard imports

* Wildcard imports

* velocity conversion

* compacting description

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

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-07-07 11:28:19 -04:00
Ilya246
e07a739ae2
randomise same-playercount team assignment (#9985) 2024-07-07 11:27:05 -04:00
SITUVNgcd
252399a7d8
Update Vietnamese translation (#9981) 
* Update Vietnamese translation

- Minor fixes.
- Translate new strings from 2ab2b03bf8.

* Translate new strings

c91f51f8d2

* Fix "intervals" translation
 2024-07-07 11:26:26 -04:00
summoner001
20792b0253
Update bundle_hu.properties (#9982) 
Hungaria translations for the new strings.
 2024-07-07 11:26:17 -04:00
Joan Josep
41f590d501
Update bundle_ca.properties (#9987) 2024-07-07 11:26:09 -04:00
Anuken
2b5e3ec4aa Fixed #9974 2024-07-07 11:18:13 -04:00
Mythril382
36f07c2590
im not even sure if this is reliable 2024-07-06 12:17:22 +08:00
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