mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-30 09:30:39 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,272 Commits 4 Branches 160 Tags 2.3 GiB
08140651f3
Commit Graph

15272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GTMZ
08140651f3
add lightdustry to the community server (#7587) 2022-09-17 08:45:18 -04:00
xem8k5
f39d30903a
Update bundle_zh_CN.properties (#7481) 
* 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

* 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

* 从我的pr同步

一些其他的翻译改进。这个merge以后我的那个pr应该就可以关了。

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

Co-authored-by: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com>
 2022-09-17 08:36:37 -04:00
Drylian
58764879d4
Update servers_v7.json (#7586) 2022-09-16 23:08:21 -04:00
Anuken
c0c4d5d97c Merge remote-tracking branch 'origin/master' 2022-09-16 19:36:07 -04:00
Anuken
53483f939c Louder UI button noise (by 'popular' demand) 2022-09-16 19:36:03 -04:00
MEEPofFaith
9d6b08a15d
Hide Items on Planets Field (#7550) 
* Hide item on planet field

* Better name, Planet[] instead of String[]

* a
 2022-09-16 12:20:43 -04:00
Anuken
2c00365701 Merge remote-tracking branch 'origin/master' 2022-09-16 11:22:52 -04:00
Anuken
bdf3bea2a4 Tantros is hidden now 2022-09-16 11:22:47 -04:00
Joan Josep
0811e52618
Update bundle_ca.properties (#7552) 2022-09-16 10:58:12 -04:00
Vojtak42
cd234f03f4
Added \n and translated sentence (#7569) 
* Added \n

* Update bundle_cs.properties

* Update bundle_cs.properties
 2022-09-16 10:57:14 -04:00
Anuken
eadf743c31 Merge remote-tracking branch 'origin/master' 2022-09-16 08:59:34 -04:00
Anuken
942a3796d7 Hide missiles on minimap 2022-09-16 08:59:28 -04:00
Drylian
7841c9e5bd
Update servers_v6.json (#7580) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-09-16 07:16:50 -04:00
karlo292
82ce3f28cc
removed my server from v6 list (#7583) 2022-09-16 07:08:24 -04:00
karlo292
5bee3820a2
Changed my server to v7 (#7582) 2022-09-16 07:08:18 -04:00
Anuken
b28b628b17 Merge remote-tracking branch 'origin/master' 2022-09-15 17:06:41 -04:00
Anuken
a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
karlo292
9cbe989ffb
Added my server to list (#7579) 2022-09-15 16:05:11 -04:00
Epowerj
faa785cda7 Fixed factory issues in caldera 2022-09-15 15:58:07 -04:00
Drylian
4a219d9b36
Update servers_v7.json (#7578) 2022-09-15 11:36:50 -04:00
Даркнесс#3729
70f3329713
Add Darkdustry HUB to BE (#7574) 
* Add Darkdustry HUB to BE

Why?
Because now our server support joining from Bleeding Edge builds (custom packet handler)
So why not?

* Why
 2022-09-15 06:56:32 -04:00
Anuken
e6213dd7b4 "Name"? 2022-09-14 20:46:35 -04:00
Epowerj
f2d0eb04dd Fixed exploit in peaks 2022-09-14 20:42:38 -04:00
Anuken
ad858c74ad Merge remote-tracking branch 'origin/master' 2022-09-14 19:39:14 -04:00
Anuken
bbb612d3cc Added missing Erekir tech to tree 2022-09-14 19:39:09 -04:00
AB
f4ecd6849f
Update servers_v7.json (#7571) 2022-09-14 18:26:26 -04:00
Даркнесс#3729
8a50aa931b
Why it uses name instead of id? (#7562) 2022-09-14 18:26:15 -04:00
MEEPofFaith
918eb1bafe
Fix ContinuousLiquidTurret not changing bullets when changing liquids. (#7561) 
* Wrong liquid, don't keep bullet alive.

* Better transition

* Annihilate unnecessary code duplication

* Further reduce duplicated code

* Unnecessary imports
 2022-09-14 10:50:23 -04:00
Anuken
38d96a26f3 Random attempts to fix Android game freeze 2022-09-14 10:28:18 -04:00
Anuken
9e2b7a060f Merge remote-tracking branch 'origin/master' 2022-09-14 07:56:55 -04:00
Anuken
8c0b03b17a Fixed wrapping issue 2022-09-14 07:56:49 -04:00
NotFinboror
662e9c5dbb
Translations and fixes of grammatical errors (#7568) 2022-09-14 07:30:27 -04:00
Ngọc Lam
a0486ba79e
Emergency Changes... (#7557) 2022-09-13 08:28:45 -04:00
gttfx
5867bc7f79
Add Vndustry on the list (#7556) 2022-09-13 07:15:52 -04:00
ulwepo
34b4fe630e
Update servers_v6.json (#7555) 
Sakura is a Japanese server.
I add hex mode.
Thank you.
 2022-09-13 07:10:51 -04:00
Anuken
bf8ebb773e Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-12 19:47:58 -04:00
Anuken
a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
MEEPofFaith
cd6332900b
Fix things being detached from mech sway. (#7480) 2022-09-12 09:59:18 -04:00
MEEPofFaith
7189be69b0
killShooter + shootOnDeath Causes Double Firing (#7524) 
* Store building pos instead of start pos

Fix an explosion hitting the same building multiple times if it's larger than 1x1.

* Increment total shots before spawning bullet

Fixes `killShooter` triggering the `shootOnDeath` shot.

* Revert "Store building pos instead of start pos"

This reverts commit bfd04e2683.
 2022-09-12 09:41:43 -04:00
Volas171
82058d347f
Update servers_v6.json (#7547) 2022-09-12 08:01:15 -04:00
Epowerj
f968a8689c Cleaning up caldera 2022-09-10 16:53:59 -04:00
Anuken
77ddbd027a Misc bugfixes and tweaks 2022-09-10 15:49:58 -04:00
Anuken
b2e960a038 Minor smooth movement tweak 2022-09-10 15:06:20 -04:00
Anuken
421d27c50c Merge remote-tracking branch 'origin/master' 2022-09-10 15:02:59 -04:00
Anuken
abb92350c0 Fixed strange smooth movement of fast ground units 2022-09-10 15:02:55 -04:00
WayZer
ad3bf51256
Update servers_v7.json (#7540) 2022-09-10 14:40:23 -04:00
SachaTending
6461ffaa21
Rename RCM category to EasyPlay (#7537) 
я не думаю то что rcr возродится
 2022-09-10 09:04:38 -04:00
Github Actions
e279ac269b Automatic bundle update 2022-09-09 22:09:40 +00:00
AB
6c9108f370
Update bundle_pt_BR.properties (#7535) 
* Update bundle_pt_BR.properties

[Portuguese] Avisos: Evitei a tradução da parte de logic, nomes de unidades e torretas. Muitas das traduções foram adaptadas, pois de forma literal ficava estranho e "feio". 
Tradução feita e revisada durante uns 5 ou 6 dias.
Caso você encontre erros, me avise no discord: ABÊ#8931
[English] Disclaimer: I avoided translating the logic part, unit and turrets names. Many of the translations were adapted, because the literal way was strange and "ugly". 
Translation done and revised during 5 or 6 days.
If you find errors, let me know at discord: ABÊ#8931

* Update bundle_pt_BR.properties
 2022-09-09 18:08:36 -04:00
Anuken
3acb449205 #7521 with len checks 2022-09-09 18:07:52 -04:00