Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,294 Commits 4 Branches 180 Tags
291ddac78b444c37bead1a13ac85f00426d535ad
Commit Graph
18294 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
a-big-fish-fishandGitHub 571301cb04 Update servers_v7.json (#10040) 2024-07-19 19:13:36 -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*nfireandGitHub 5a493c0338 Update CoreBlock.java (#10025) 
Allows destroyBullet to work on coreBlock.
 2024-07-13 10:30:36 -04:00
abcxyzDustryandGitHub f90de0af9c Update servers_v7.json (#10021) 2024-07-12 13:22:08 -04:00
routerandGitHub 00e7271f31 Update servers_v7.json (#10017) 
kill me
 2024-07-12 13:19:44 -04:00
StalkerBaranandGitHub d3b952a210 Update servers_v7.json (#10015) 
Update MeowIsland
 2024-07-12 13:19:36 -04:00
summoner001andGitHub 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 bd4b56857e Merge remote-tracking branch 'origin/master' 2024-07-08 11:08:08 -04:00
Anuken abfbb46bc1 Downgrade Android gradle plugin for IJ compatibility 2024-07-08 11:08:01 -04:00
3MIDEVandGitHub 534f8a3ce2 Update servers_v7.json (#10009) 
moved off the proxied domain ping was hell
 2024-07-07 20:18:53 -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
SITUVNgcdandGitHub e3f9e19f13 Update Vietnamese translation (#10008) 
https://github.com/Anuken/Mindustry/commit/41aea39a80ff8d9cf56e9af132e2eed5b435323c
 2024-07-07 12:58:51 -04:00
Anuken cd298edfe7 Unused variable removed 2024-07-07 12:22:12 -04:00
SomeonesShadeandGitHub a184abb117 Flux Power and Heat Capacity Increase (#9500) 2024-07-07 11:52:58 -04:00
MEEPofFaithandGitHub 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
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