Anuken
ddc637eee6
Merge remote-tracking branch 'origin/master'
2022-08-17 10:34:39 -04:00
Anuken
43fae3b9e3
Fixed #7382
2022-08-17 10:34:34 -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
Anuken
a7f939de4c
Misc balance
2022-08-16 09:13:22 -04:00
Anuken
f9ba1c3e04
Merge remote-tracking branch 'origin/master'
2022-08-16 07:24:00 -04:00
Anuken
a8b8028835
Hide Erekir resources on Serpulo loadout
2022-08-16 07:23:55 -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
Anuken
ec8e48f3f5
Metaglass cyclone buff
2022-08-15 17:14: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
BlackDeluxeCat
6842daf8fb
Fixed duct unloader works with core-linked storage ( #7367 )
2022-08-15 06:59:11 -04:00
Anuken
b88b5fa32a
Merge remote-tracking branch 'origin/master'
2022-08-14 15:40:01 -04:00
Anuken
f15a620c45
Allow neoplasm on water/arkycite/etc
2022-08-14 15:39:56 -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
Anuken
1f318306a7
Merge remote-tracking branch 'origin/master'
2022-08-13 10:56:24 -04:00
Anuken
dbabb07528
Gradle 7.5.1
2022-08-13 10:56:19 -04:00
MEEPofFaith
25388ffe5f
Better Duplicate Op Support (json/hjson) + 1 more op ( #7355 )
...
* Better support for duplicate ops
* 'Mathf.curve' op
2022-08-13 06: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
Anuken
1a85c85a22
Fixed assembler module input edge sprite
2022-08-11 10:44:11 -04:00
Anuken
e4c6822cca
JSON payload stack support
2022-08-11 08:43:58 -04:00
MEEPofFaith
3f96799c2e
Make PayloadAmmoTurret accept units ( #7320 )
2022-08-11 08:38:45 -04:00
Lucky Clover
b3f43dbc03
worldCell.targetable = false ( #7345 )
2022-08-11 07:23:11 -04:00
MEEPofFaith
3fc0957197
Shielded wall shield size ( #7343 )
2022-08-10 14:52:20 -04:00
Epowerj
ce8d51e18e
Work on peaks
2022-08-10 10:52:59 -04:00
BlackDeluxeCat
5e63b89f4f
Fixed ucontrol approach not applied to ground units ( #7340 )
2022-08-10 08:06:12 -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
648a4b5e61
Tweaked tech tree for peaks
2022-08-09 19:45:51 -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
43937db6df
Added peaks to tech tree
2022-08-09 15:50:45 -04:00
Epowerj
63cf6f6fb2
Reduced breach tungsten damage
2022-08-09 15:49:51 -04:00
Epowerj
2344cc442b
Added peaks to code
2022-08-09 15:47:43 -04:00
Epowerj
48cb99774a
Added peaks
2022-08-09 15:46:32 -04:00
Anuken
6e11418fa4
Fixed #7331
2022-08-09 09:11:11 -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
Anuken
bae64cb98a
Median error fix
2022-08-08 17:34:46 -04:00
Epowerj
f4798f5adc
hid a bunch of stuff from the tech tree for now
2022-08-08 15:54:33 -04:00
Anuken
469a49b3d6
Cleanup
2022-08-08 14:27:10 -04:00
BlackDeluxeCat
0802941cb8
Fixed HeatCrafter Consumes Less Liquid ( #7288 )
2022-08-08 14:24:45 -04:00
Anuken
fae3360dfc
Fixed #7327
2022-08-08 14:05:01 -04:00
Anuken
94d13267e8
Merge branch 'master' of https://github.com/Anuken/Mindustry
2022-08-07 22:54:30 -04:00
Anuken
01c3738275
Misc cleanup
2022-08-07 22:54:05 -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
JniTrRny
6a2c6e3a74
the return of deselectable ( #7319 )
2022-08-07 13:10:12 -04:00
Anuken
a28601d91c
Interplanetary accelerator beta info text
2022-08-06 17:31:21 -04:00
Epowerj
4b9b4f3c0b
Progress on marsh
2022-08-06 15:03:36 -04:00
Anuken
39ebc046ad
Fixed objectives dialog scaling
2022-08-06 14:06:24 -04:00
Anuken
ecdedf383a
Merge remote-tracking branch 'origin/master'
2022-08-06 13:38:35 -04:00
Anuken
32f3190762
Less stacking in objectives dialog
2022-08-06 13:38:31 -04:00
Lucky Clover
e4255755ec
liquidTank should be consistant as well ( #7311 )
2022-08-06 13:32:13 -04:00
Anuken
9d1c03ccd9
Merge remote-tracking branch 'origin/master'
2022-08-06 13:30:52 -04:00
Anuken
45e5ab8ecc
Fixed #7310
2022-08-06 13:30:47 -04:00
SoMall-dumpling
aa5ba1a3aa
Update FlakBulletType.java ( #7313 )
...
fix erekir core unit make flak bullets explode
2022-08-06 13:29:47 -04:00
Anuken
e9eb713a39
Fixed #7309
2022-08-06 00:12:34 -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
Anuken
a833bb09fe
Merge remote-tracking branch 'origin/master'
2022-08-05 16:27:28 -04:00
Anuken
36ce1ea2af
Faster beryllium drilling with burst drills
2022-08-05 16:27:23 -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
Anuken
6a5d7da4ae
Fixed #7303 / Fixed #7302
2022-08-05 14:25:37 -04:00
Anuken
8b6d3a67f3
Fixed #7299
2022-08-05 09:39:45 -04:00
Anuken
0f831d598d
Fixed #7296
2022-08-05 09:35:04 -04:00
Anuken
11d3b1d973
Fixed #7292
2022-08-04 20:20:46 -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
f728bd643a
Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2
2022-08-04 19:02:22 -04:00
Epowerj
1fa34518d6
Progress on marsh
2022-08-04 19:02:11 -04:00
Anuken
62d0d62d22
Fixed squished pump liquid icon
2022-08-04 18:45:51 -04:00
Epowerj
1245ff006f
Progress on marsh
2022-08-04 18:45:26 -04:00
Anuken
f9c73c2fdc
Merge remote-tracking branch 'origin/master'
2022-08-04 18:43:42 -04:00
Anuken
bf926d139d
Fixed akrycite output
2022-08-04 18:43:38 -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
Anuken
1bb45fe91c
Minor bugfixes/cleanup
2022-08-04 13:49:22 -04:00
Anuken
46f8838d1a
Fixed #7284
2022-08-04 10:23:49 -04:00
Anuken
1d8166669b
Fixed #7283
2022-08-04 10:14:13 -04:00
Anuken
db8e7675c8
Merge remote-tracking branch 'origin/master'
2022-08-03 23:44:10 -04:00
Anuken
243a672a5b
Disabled NetworkIO entity writing
2022-08-03 23:44:07 -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
MEEPofFaith
ff28daa3a4
FlakDelay ( #7281 )
2022-08-03 17:08:53 -04:00
Epowerj
8a51ac0bdc
More work on marsh
2022-08-03 16:33:21 -04:00
Epowerj
00d6a73c27
Tweaked tech tree and for marsh
2022-08-03 16:33:14 -04:00
Anuken
3138f05cc2
Merge remote-tracking branch 'origin/master'
2022-08-03 16:09:10 -04:00
Anuken
58246747ee
Fixed shielded wall being available on Serpulo
2022-08-03 16:09:05 -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
Anuken
e28d7b8d8d
Generator explosion system cleanup
2022-08-02 13:13:37 -04:00
Anuken
fa1a5971cf
Merge remote-tracking branch 'origin/master'
2022-08-01 20:56:41 -04:00
Anuken
9a95754007
Fixed incorrect scaling with command layout
2022-08-01 20:56:37 -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
Anuken
36ecb45fb4
Minor UI style tweaks
2022-07-31 13:59:31 -04:00
Anuken
3d0a1868c6
Merge remote-tracking branch 'origin/master'
2022-07-31 11:43:26 -04:00
Anuken
427100c61d
Fixed commanded unit UI refresh
2022-07-31 11:43:23 -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
Anuken
83ccd0cf48
Merge remote-tracking branch 'origin/master'
2022-07-31 10:38:00 -04:00
Anuken
1fe988adc2
Fixed unit movement overshoot
2022-07-31 10:37:55 -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
Anuken
3d64047a91
Fixed Quad Repair AI
2022-07-31 00:30:37 -04:00
Anuken
ce0a8de25b
Fixed certain units having useless mine command
2022-07-31 00:16:30 -04:00
Anuken
a87aa75adb
More misc cleanup
2022-07-30 23:06:59 -04:00
Anuken
7df2a7ad43
Fixed #7260
2022-07-30 23:03:54 -04:00
Anuken
a0c4ed11c6
Merge remote-tracking branch 'origin/master'
2022-07-30 21:59:40 -04:00
Anuken
0debdee40b
Fixed more wide water / Unit command JSON support
2022-07-30 21:59:36 -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
Anuken
a326e36bbe
Merge remote-tracking branch 'origin/master'
2022-07-30 10:05:06 -04:00
Anuken
b9753204da
Fixed #7256
2022-07-30 10:05:01 -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
xStaBUx
0cd80b70b7
Water in cryofluid mixer & cultivator ( #7244 )
...
* criofluid mixer, cultivator & spore press liquids fix
water and oil now displayed in cryofluid mixer, cultivator and spore press
* 1
* 2
2022-07-28 09:43:52 -04:00
BlackDeluxeCat
df1df66c6c
Update FilterOption.java ( #7248 )
2022-07-28 09:42:52 -04:00
RlCCJ
311cd86e47
Why is it here? ( #7240 )
...
BlockProducer already has buildSpeed.
2022-07-28 09:42:33 -04:00
BalaM314
d18579b59a
Allow printflush
ing to null ( #7243 )
...
* Allow `printflush`ing to null
* Dumb
2022-07-28 09:41:31 -04:00
hortiSquash
02c4e905a5
More Optimized Unloaders (Serpulo) ( #7249 )
...
* Update Unloader.java
* some comments
* deleted highUnloadPriority
2022-07-28 09:41:11 -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
c1971cb5b1
Fixed #7241
2022-07-28 09:30:19 -04:00
Anuken
5fb7c2a916
Fixed #7239
2022-07-28 09:26:28 -04:00
Anuken
fa3bd6dbc6
Fixed #7227
2022-07-23 13:15:54 -04:00