Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 21:07:25 +03:00
Code Issues Projects Releases Wiki Activity
14,680 Commits 4 Branches 160 Tags 2.1 GiB
e6426d89e3
Commit Graph

14680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
彭瑞暄
e6426d89e3
Update bundle_zh_TW.properties (#7128) 2022-07-05 15:04:27 -04:00
MSB
99f6f2c00d
Update bundle_nl.properties (#7129) 2022-07-05 15:04:12 -04:00
Github Actions
de27ce89a7 Automatic bundle update 2022-07-05 18:59:58 +00:00
ThatOneBepis
f880843dfd
it here (#7130) 2022-07-05 14:59:02 -04:00
Anuken
77c5fc02a6 Merge remote-tracking branch 'origin/master' 2022-07-05 12:34:24 -04:00
Anuken
4d8bcfebf2 Halo draw part + Ravage halo 2022-07-05 12:34:18 -04:00
HostingAccount
ef6750b0c7
Update servers_v6.json (#7125) 2022-07-05 11:54:45 -04:00
Anuken
b33f19b048 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-05 10:44:38 -04:00
Anuken
8fa6a98027 Fixed some squished liquids 2022-07-05 10:44:36 -04:00
Goobrr
fe51500e8e
Use new drawers (#7127) 2022-07-05 10:44:15 -04:00
Anuken
a4e482f55a Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-04 20:23:08 -04:00
Anuken
5ce61b863b New WIP turret 2022-07-04 20:23:05 -04:00
MEEPofFaith
4e8736de6c
alwaysContinuous weapons have no reload (#7124) 2022-07-04 17:28:23 -04:00
Sam Bloom
9dd6de7e33
AAS Sandbox (#7123) 2022-07-04 16:52:36 -04:00
Anuken
5b1d1a2ce4 Misc minor fixes 2022-07-04 16:52:18 -04:00
Anuken
02dd74b113 Merge remote-tracking branch 'origin/master' 2022-07-03 18:38:07 -04:00
Anuken
ae842ac9e1 Partial rollback for #7117 2022-07-03 18:38:00 -04:00
JniTrRny
51a42ae4f5
I kid you not (#7119) 2022-07-03 16:15:36 -04:00
Lucky Clover
cdbe1a9123
revert the most vehemently OPPOSED zh-CN translation (#7112) 2022-07-03 14:49:24 -04:00
Github Actions
adb000d1c8 Automatic bundle update 2022-07-03 18:48:42 +00:00
Alex25820
6323c926f8
Update bundle_sv.properties (#7077) 
* Update bundle_sv.properties

* Update contributors

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-03 14:47:26 -04:00
Github Actions
aea5097dfc Automatic bundle update 2022-07-03 18:46:05 +00:00
Damian
36e50d81cc
Update at bundle_pl.properties (#7116) 
Pneumatic drill not drill pneumatic, new descriptions for some units and a bunch of corrections.
 2022-07-03 14:44:59 -04:00
Anuken
443a60dc76 Merge remote-tracking branch 'origin/master' 2022-07-03 14:32:26 -04:00
Anuken
3e4b754a60 Weapon support for "always-continuous" bullets 2022-07-03 14:32:21 -04:00
1stvaliduser
64dc854bdd
Update bundle_uk_UA.properties(small changes) (#7118) 
* Update bundle_uk_UA.properties

A lot of stuff

* :)

* Update bundle_uk_UA.properties

Small changes

* Update bundle_uk_UA.properties

Oops

* Update bundle_uk_UA.properties
 2022-07-03 14:17:52 -04:00
JniTrRny
0201e08ac9
generation UI fix + other miniscule ui fix (#7117) 2022-07-03 13:54:30 -04:00
Phinner
685e3cac83
Add support for SRV records (#6982) 
* SRV record support

* respect the formatting II

* avoid blocking call

* Add android support

* switch to stripped down version of dnsjava

* move srv lookup from `Net` to `NetProvider`

* random optimizations

* bump arc and restart the thing

* reimplement using ArcDns

* Update core/src/mindustry/net/ArcNetProvider.java

Co-authored-by: buthed010203 <naguiar010203@gmail.com>

* Update ArcNetProvider.java

Co-authored-by: buthed010203 <naguiar010203@gmail.com>
 2022-07-03 10:37:58 -04:00
Anuken
4d5f16e75d Merge remote-tracking branch 'origin/master' 2022-07-03 09:43:22 -04:00
Anuken
3b1930777f Fixed #7115 2022-07-03 09:43:15 -04:00
Mythril382
0d8a46943b
i made a mistake aaaaaaaaaaa (#7114) 2022-07-03 09:26:44 -04:00
Anuken
4c9a3def1d Merge remote-tracking branch 'origin/master' 2022-07-03 09:18:40 -04:00
Anuken
7d67585f9a JSON ClassMap update 2022-07-03 09:18:35 -04:00
Somka000
40dd80b95a
Wall in mindustry is not a wall in a house (#7111) 2022-07-02 20:21:59 -04:00
Github Actions
bcb3a3bbed Automatic bundle update 2022-07-02 21:38:05 +00:00
Damian
773232bcb9
Update at bundle_pl.properties (#7110) 
Names for new content, new descriptions and corrections. Merged with not accepted update from over a week ago.
 2022-07-02 17:37:11 -04:00
Mythril382
e34637a02f
Display Bullet Status Duration (#7109) 
* whad

i have no idea if this works

and have no idea if the formatting is right

💀

* int

int

* i am an idiot

yes i am

an idiot
 2022-07-02 17:36:41 -04:00
Angel-24
895122848c
[ES] update bundle_es.properties (#7034) 
* [ES] update bundle_es.properties

Translated the latest automatic bundle updates and reviewing a few changes from the previous commit.

* Revisión junto a RexHm

* Update bundle_es.properties

P

* Update bundle_es.properties

* Volas171 translations.

* Update bundle_es.properties

Just realized how world processors works. I was considering to update this block's names, but referring to "world" as "integrado" somehow alludes that these blocks cannot be damaged or broken, so I decided to keep their names anyways. I'd bet they're actually fine. :P
 2022-07-02 10:26:08 -04:00
Nunting
6974e5bbe6
Update bundle_ko.properties (#7105) 2022-07-02 10:17:58 -04:00
xem8k5
dd3f507b97
Update bundle_zh_CN.properties (#7107) 2022-07-02 10:17:50 -04:00
Lucky Clover
fb3b69a401
fix added assembler module doesnt reset progress (#7108) 2022-07-02 10:17:43 -04:00
Joel
aa310bd205
fix: IconConverter using deprecated inkscape --verb option (#7106) 
* fix: IconConverter using deprecated inkscape --verb option

* refactor: remove unused option in tools/build.gradle
 2022-07-02 10:10:03 -04:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
JniTrRny
371394df6f
nice typo (#7104) 2022-07-01 12:51:47 -04:00
Anuken
480c59b89f Merge remote-tracking branch 'origin/master' 2022-07-01 12:36:59 -04:00
Anuken
a9c0beee61 Missile stat value display 2022-07-01 12:36:54 -04:00
Github Actions
638172c8cf Automatic bundle update 2022-07-01 15:50:59 +00:00
xem8k5
f594461971
Update bundle_zh_CN.properties for scathe (#7095) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-07-01 11:50:03 -04:00
superSTA101
63b863166b
Update bundle_fi.properties (#7103) 
I transalted few words and descriptions and also fixed some. Imight translate more in the future :)
 2022-07-01 11:49:49 -04:00
Nunting
a30172c604
Update bundle_ko.properties (#7098) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-01 11:48:55 -04:00