mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 01:44:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,162 Commits 4 Branches 160 Tags 2.3 GiB
5ecd73bdb0
Commit Graph

5483 Commits

Author SHA1 Message Date
- MV -
f0300dcdde
TRANSLATION (it) (#7381) 2022-08-23 08:33:46 -04:00
Anuken
976f9f43f6 Slightly better titan shoot SFX 2022-08-22 22:06:40 -04:00
Epowerj
9a0713523d Progress on peaks 2022-08-22 20:38:23 -04:00
Epowerj
14da646c57 Progress on peaks 2022-08-22 18:42:39 -04:00
Anuken
fcb99103dd Erekir unit SFX 2022-08-22 13:45:35 -04:00
Anuken
450dd90862 Drill/factory/generator noises 2022-08-22 10:27:49 -04:00
Anuken
57c07b7ebb More turret SFX 2022-08-21 23:53:07 -04:00
Anuken
f88ff59d49 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-21 20:44:12 -04:00
Anuken
2c28b206b8 Erekir turret SFX (of varying quality) 2022-08-21 20:44:07 -04:00
zenonet
dde9f895cf
Added autoPause config for servers (#7405) 
* Extracted the method ServerControl.setPauseState()

* Added a comment to EventType.PlayerLeave

* Added the `pauseWithoutPlayers` config

* Revert "Extracted the method ServerControl.setPauseState()"

This reverts commit 45f5b01547.

* Renamed pauseWithoutPlayers to autoPause,
fixed manual- and automatic pausing to interfere
and made the server pause when hosting a new game

* Added a dot to the config description of `autoPause` and added my name to the contributors list

* Refactoring

* Merged remote-tracking changed I guess

* More refactoring

* More refactoring

* Removed logging about autoPause

* Removed another log I forgot in the last commit

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-21 10:32:58 -04:00
Rex Aliis
62a3f30755
Update contributors (#7406) 2022-08-21 10:31:41 -04:00
BlackDeluxeCat
cc3f14100d
Fixed reactor light (#7385) 
* Fixed nuclear reactor light

* .
 2022-08-17 21:05:01 -04:00
ManuWar73
5a2ba71198
Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Github Actions
b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24
dff0a8294e
Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions
03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄
1f57332091
Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas Widyantoko
287ccf7e84
Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan Josep
fd70598476
Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
K0baU
fe1d81b4d5
Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -04:00
Github Actions
522070be4b Automatic bundle update 2022-08-13 17:54:18 +00:00
Phinner
4030acbd75
Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

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

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Joan Josep
8132e1f3aa
Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions
1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
Phinner
935d096b26
French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00
Github Actions
f3154d606b Automatic bundle update 2022-08-11 16:07:20 +00:00
Anuken
8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Github Actions
2f7a646e2b Automatic bundle update 2022-08-11 15:37:24 +00:00
Luna
e28dbfad69
Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Epowerj
ce8d51e18e Work on peaks 2022-08-10 10:52:59 -04:00
Github Actions
44af0bc08b Automatic bundle update 2022-08-10 02:51:16 +00:00
ThatOneBepis
0fa21ce165
Previous "update bundle_sr.properties" but no Sine shenanigans (#7333) 
* Update bundle_sr.properties

* ln but with angles

* rollback

* you saw nothing
 2022-08-09 22:50:14 -04:00
Epowerj
1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj
bc38d71f98 Progress on peaks 2022-08-09 16:52:36 -04:00
Epowerj
9f9e854c5f Progress on peaks 2022-08-09 16:47:13 -04:00
Github Actions
75b5efd5e2 Automatic bundle update 2022-08-09 20:03:27 +00:00
Nunting
a31175377a
Update bundle_ko.properties (#7307) 
* Update bundle_ko.properties

Unification of reactor terms. 
원자로 -> 반응로 통일. 같은 의미이지만 어감이 다름.

Added detailed description of parallax for beginners. This is not official and can be removed at any time.
초보자를 위한 패럴랙스 디테일 추가. 공식 설명이 아니므로 제거될 수 있음.

* Update bundle_ko.properties

토륨/핵융합 반응로->원자로로 복원
 2022-08-09 16:02:28 -04:00
SUS
f01278cf72
Update bundle_uk_UA.properties (#7318) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)

* Update bundle_uk_UA.properties

Start...

* Update bundle_uk_UA.properties

1

* Update bundle_uk_UA.properties

2

* Update bundle_uk_UA.properties

3.1

* Update bundle_uk_UA.properties

4

* Update bundle_uk_UA.properties

5

* Update bundle_uk_UA.properties

6

* Update bundle_uk_UA.properties

7

* Update bundle_uk_UA.properties

8

* Update bundle_uk_UA.properties

Finally (I'm waiting)
 2022-08-09 16:02:19 -04:00
Epowerj
48cb99774a Added peaks 2022-08-09 15:46:32 -04:00
Epowerj
901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
彭瑞暄
af503d1a50
Update bundle_zh_TW.properties (#7190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2022-08-07 21:38:00 -04:00
Epowerj
4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -04:00
Epowerj
33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj
a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj
605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj
b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -04:00
Epowerj
dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Epowerj
4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Epowerj
aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Joan Josep
275293e45c
Update bundle_ca.properties (#7301) 
* Update bundle_ca.properties

* Update bundle_ca.properties
 2022-08-05 15:09:05 -04:00
Github Actions
031ca650bd Automatic bundle update 2022-08-05 18:27:32 +00:00
Thomas Widyantoko
e3c4bd86db
[ID] id_ID bundle update (#7175) 
* [ID] various bundle update

+ Mod Browser release, some editor functions, sector four description, and more

* quick bundle update

sector, block, logic descriptions and other fixes
will continue again later my house is being renovated bruh

* finalizing v7 alpha id_ID translation

turrets are now translated, adjusted stats and status to match its function, and stuff

* added heat source to id_ID

...and other new things i guess

* adds new lines from EN bundle to id_ID

includes Neoplasia Reactor and other fixes

also things changed a lot behind the scenes
 2022-08-05 14:26:38 -04:00
Epowerj
d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -04:00
Epowerj
1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00
Epowerj
1245ff006f Progress on marsh 2022-08-04 18:45:26 -04:00
Epowerj
f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2022-08-04 14:55:14 -04:00
Epowerj
e3566bda28 Progress on marsh 2022-08-04 14:32:05 -04:00
Nunting
a13c8f5c4a
Update bundle_ko.properties (#7285) 2022-08-04 14:06:47 -04:00
Epowerj
d9312bc960 Progress on marsh 2022-08-04 13:51:41 -04:00
Epowerj
d6a0ce0fce Progress on marsh 2022-08-03 21:09:37 -04:00
Nunting
45f8712fe8
Update bundle_ko.properties (#7262) 2022-08-03 19:36:06 -04:00
Epowerj
8a51ac0bdc More work on marsh 2022-08-03 16:33:21 -04:00
SoMall-dumpling
c8257871b9
Update bundle_zh_CN.properties (#7261) 
* Update bundle_zh_CN.properties

The Ultimate Unit Control System Translation

* Update bundle_zh_CN.properties

The Ultimate Flux Reactor

* Update bundle_zh_CN.properties

删除一个多余的空行

* Update bundle_zh_CN.properties

语序调整
 2022-08-03 08:32:20 -04:00
Github Actions
65db43268c Automatic bundle update 2022-08-03 01:27:29 +00:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
Epowerj
e2dea0f84e Begin rework of basin 2022-08-02 18:32:26 -04:00
Epowerj
d77afbea06 Being work on marsh 2022-08-02 18:17:53 -04:00
Github Actions
efb258e9a6 Automatic bundle update 2022-08-02 00:29:14 +00:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
Joan Josep
d029c85ec5
Add Catalan to available languages and start its localisation. (#7076) 
* Add Catalan to available languages and start its localisation.

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update Catalan.properties

* Update Catalan.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundles_ca.properties

* Update bundles_ca.properties

* Update bundle_ca.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-31 10:57:00 -04:00
Anuken
765684a9b0 Fixed #7263 2022-07-31 10:55:33 -04:00
Nunting
9c276f362d
Update bundle_ko.properties (#7253) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-31 00:50:26 -04:00
Github Actions
cf9a7f0c63 Automatic bundle update 2022-07-31 01:03:28 +00:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
RTOmega
a3bdcd175b
TR Bundle Cleanup (#7229) 2022-07-28 15:38:16 -04:00
Github Actions
b55465a4b0 Automatic bundle update 2022-07-28 14:22:45 +00:00
SoMall-dumpling
a263aa781d
Update bundle_zh_CN.properties (#7189) 
* Update bundle_zh_CN.properties

The following updates will focus on better unit names, turret names, map names, and other untranslated stuff.

* Update bundle_zh_CN.properties

four new lines

* Update bundle_zh_CN.properties

Revert rollback, and some missing translations.

* Update bundle_zh_CN.properties

map names

* Update bundle_zh_CN.properties

turret names, arkycite-related translations

* Update bundle_zh_CN.properties

boulders

* 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

这个\n的位置我实在看不下去了

* Create bundle_zh_CN.properties

恶灵->魔灵

* Update bundle_zh_CN.properties

奇奇怪怪多出来个\n

* 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

two new lines

* Update bundle_zh_CN.properties

还是改回来。事实上墙的描述是挡下敌方炮弹，但也挡不住抛射炮。所以没有太大必要改前面的东西。（而且shell也是炮弹的意思）
死神，太逊啦

* 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-28 10:21:38 -04:00
Catchears
224cc80b59
update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00
Anuken
d98f26d35b Erekir unit logic ID order changed 2022-07-22 14:10:46 -04:00
Anuken
0e81d19bd4 Merge remote-tracking branch 'origin/master' 2022-07-22 14:06:40 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
Github Actions
43f7384855 Automatic bundle update 2022-07-22 18:00:35 +00:00
RTOmega
9a3a6c31b3
Adding Block: Heat Source (#6855) 
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-22 13:59:32 -04:00
Anuken
687d0b4f00 Misc minor bugfixes 
at 4 AM
 2022-07-22 03:51:24 -04:00
Github Actions
b94393f150 Automatic bundle update 2022-07-19 02:16:10 +00:00
Anuken
1c2aca91e4 Merge remote-tracking branch 'origin/master' 2022-07-18 22:14:57 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Epowerj
2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj
a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj
1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00
Epowerj
fceec59a61 Added more resources to onset 2022-07-18 11:21:13 -04:00
Github Actions
32871920b2 Automatic bundle update 2022-07-18 00:36:56 +00:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Anuken
1e7219f7d1 Merge remote-tracking branch 'origin/master' 2022-07-17 10:27:31 -04:00
Anuken
ebf9e82146 Crash fixes / Mod browser >=136 filter 2022-07-17 10:27:27 -04:00
Github Actions
ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky Clover
93f12a5544
Update bundle_zh_CN.properties (#7135) 
* Update bundle_zh_CN.properties

* 部分补充

* 光彩统一改成光效

* Update bundle_zh_CN.properties

Thanks @SoMall-dumpling for review

* Suggestions from @xem8k5, @Cry0flu1d and more

* thanks mi2/xerxer

* miner fix

* Corrections from SoMall-dumpling

* Update suggestions from  @nanmenyangde

* liquid翻译讨论确定：液体->流体

* from @nanmenyangde

* suggestion from @SoMall-dumpling & @BlackDeluxeCat
 2022-07-17 09:21:53 -04:00
Github Actions
4ac7254842 Automatic bundle update 2022-07-16 15:32:30 +00:00
ThatOneBepis
4c80cf90cc
Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00