Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,316 Commits 4 Branches 180 Tags
59e64ab37c81877833b7818cc87c162209a1de90
Commit Graph
18316 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEPofFaithandGitHub 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
AnukenandGitHub 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
TripleToxicGitHubAnuken
 		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
Ilya246andGitHub e07a739ae2 randomise same-playercount team assignment (#9985) 2024-07-07 11:27:05 -04:00
SITUVNgcdandGitHub 252399a7d8 Update Vietnamese translation (#9981) 
* Update Vietnamese translation

- Minor fixes.
- Translate new strings from https://github.com/Anuken/Mindustry/commit/2ab2b03bf8281b31efc08c771acb78f9d8880afc.

* Translate new strings

https://github.com/Anuken/Mindustry/commit/c91f51f8d27c7a25fcb00609a0a105ccdf1d3e29

* Fix "intervals" translation
 2024-07-07 11:26:26 -04:00
summoner001andGitHub 20792b0253 Update bundle_hu.properties (#9982) 
Hungaria translations for the new strings.
 2024-07-07 11:26:17 -04:00
Joan JosepandGitHub 41f590d501 Update bundle_ca.properties (#9987) 2024-07-07 11:26:09 -04:00
VainerGitHubAnuken
 		642db09dd9 Update servers_v7.json (#9989) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2024-07-07 11:24:24 -04:00
alexandGitHub a34433c5ce add UK servers (#9993) 2024-07-07 11:23:43 -04:00
WayZerandGitHub 5c10f7fc06 Update servers_be.json (#10002) 2024-07-07 11:23:34 -04:00
3MIDEVandGitHub ae268e7b2c Update servers_v7.json (#10004) 2024-07-07 11:23:25 -04:00
SITUVNgcdandGitHub e06803601d Add VNM Community server (#9980) 2024-07-07 11:23:04 -04:00
StalkerBaranandGitHub 9772c6e957 Update servers_v7.json (#9975) 
Add a new ~~very sus hex-like~~ server (MeowIsland)
 2024-07-07 11:22:11 -04:00
Anuken 2b5e3ec4aa Fixed #9974 2024-07-07 11:18:13 -04:00
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
Mythril382andGitHub 36f07c2590 im not even sure if this is reliable 2024-07-06 12:17:22 +08:00
Mythril382andGitHub 51dc58379b Merge branch 'master' into do-you-hear-the-voices-too 2024-07-06 12:12:51 +08: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
Mythril382andGitHub 94ebec4b6d should 2024-06-21 01:50:48 +08:00
TomokoandGitHub 972e1a7704 Update servers_v7.json (#9972) 2024-06-20 11:27:40 -04:00
ElixiasGitHubAnuken
 		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
StalkerBaranandGitHub d897f1b7b0 Update servers_v7.json (#9960) 
IP change (MeowIsland, fixed)
 2024-06-20 11:21:04 -04:00
nowords123andGitHub d72b6586f3 Update servers_v7.json (#9967) 2024-06-20 11:20:37 -04:00
3MIDEVandGitHub cb225ba8f6 Update servers_v7.json (#9966) 2024-06-20 11:20:28 -04:00
RTOmegaandGitHub 7344abae49 TR Bundle Update (#9969) 
* Update bundle_tr.properties

* Update bundle_tr.properties
 2024-06-20 10:50:13 -04:00
Cubical boxandGitHub 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
summoner001andGitHub 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
AnukenandGitHub 7a42cffa6d Update LStatements.java 2024-06-17 07:40:30 -04:00
Mythril382andGitHub 07d20a8da5 refactor 1 2024-06-17 02:21:55 +08:00
Mythril382andGitHub f4882d6615 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-17 02:06:46 +08:00
Synthwave84GitHubAnuken
 		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 JosepandGitHub 6b0702a805 Update bundle_ca.properties (#9950) 2024-06-16 09:33:51 -04:00
summoner001andGitHub 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