mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,085 Commits 4 Branches 160 Tags 2.3 GiB
7db5e551f1
Commit Graph

5056 Commits

Author SHA1 Message Date
Anuken
7c22478618 Multi-tread support for tanks 2022-01-30 17:10:04 -05:00
Anuken
3f8a7f591a Disabled Erekir invasions & planet simulation 2022-01-30 11:34:52 -05:00
smol
29311806a9
PlayerConnectionConfirmed (#6539) 
* PlayerConnectionConfirmed

* AdminRequestEvent
 2022-01-29 11:34:34 -05:00
Anuken
77dc453e75 Crystal biome gen tweaks 2022-01-29 10:52:46 -05:00
Anuken
ac68edda40 Core launch capacity tweaks 2022-01-28 14:00:03 -05:00
Anuken
adbda61faf Tweaks 2022-01-27 15:09:38 -05:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
 2022-01-27 14:58:44 -05:00
Anuken
7cdd9edb5f Fixed beam drills not contributing to production 2022-01-27 14:39:21 -05:00
Anuken
b78f0124cb Wave tweaks 2022-01-27 14:19:12 -05:00
Anuken
632bc79924 Balancing 2022-01-27 14:15:30 -05:00
Anuken
20f30d820b Aware waves 2022-01-26 18:57:54 -05:00
epowerj
958433f253 Update aware map to add more steam vents 2022-01-26 15:21:34 -05:00
Anuken
f97d7edffb Loadout env fixes 2022-01-26 14:01:38 -05:00
Anuken
06a4f65728 Aware: Waves 2022-01-26 13:40:32 -05:00
Anuken
121ae08240 New WIP sector preset 2022-01-26 00:13:43 -05:00
Anuken
9391c14ad4 Unit unbind control 2022-01-24 23:26:34 -05:00
Anuken
b79ed071b8 Correct erkir cloud color 2022-01-24 13:50:47 -05:00
Anuken
4a07c95e1c initialWaveSpacing rule 2022-01-24 13:34:55 -05:00
Anuken
551d01bf6e Starting balance 2022-01-24 12:21:45 -05:00
Anuken
0c9bcbf69a Removed Onset starting items 2022-01-23 17:22:02 -05:00
Anuken
bfe893adfb Bugfixes & Onset items 2022-01-23 17:15:23 -05:00
epowerj
d66c386881 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features 
# Conflicts:
#	core/assets/maps/onset.msav
 2022-01-23 17:02:39 -05:00
epowerj
4bdfa894af Updated onset map to remove some areas and add derelict storage 2022-01-23 17:00:27 -05:00
Anuken
8853afc221 Removed unused coral chunk block 2022-01-23 16:58:52 -05:00
Anuken
abf429acb1 Unit wall mining 2022-01-23 16:57:09 -05:00
Anuken
608e25c2ee Research tweaks 2022-01-23 15:45:40 -05:00
Anuken
56334d9199 Misc bugfixes 2022-01-23 15:34:51 -05:00
Anuken
5a2d69278b Unlock necessary blocks before landing 2022-01-23 15:28:12 -05:00
Anuken
b281f29f01 Onset 4 waves 2022-01-23 14:41:58 -05:00
Anuken
4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
Anuken
d9bcdf3f37 Cleanup 2022-01-22 16:47:59 -05:00
Anuken
48585274cf Onset sector 2022-01-22 16:43:36 -05:00
Anuken
fdcc373813 Editor experimental sector generator 2022-01-22 15:06:46 -05:00
Anuken
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
CPXMC
30070ce759
Change my main name in Contributors (#6513) 
CPXMC to PCX-LK
 2022-01-21 20:05:48 -05:00
Anuken
cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
Anuken
8fc7aff7ef More decoration blocks 2022-01-20 15:49:47 -05:00
Anuken
0e790e61f2 Generation tweaks 2022-01-20 15:19:03 -05:00
Anuken
698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
Anuken
45178046d0 Crystal blocks 2022-01-19 21:24:02 -05:00
Anuken
4bee7e598b Red ice boulders 2022-01-19 18:54:15 -05:00
Anuken
7240da5016 More crystals 2022-01-18 22:47:31 -05:00
Anuken
19ddc1dd65 WIP crystal biome 2022-01-18 20:35:43 -05:00
Anuken
f3811d6710 Ore renaming 2022-01-18 10:48:27 -05:00
VizardAlpha
3311e40906
Update bundle_fr.properties (#6373) 
* Update bundle_fr.properties

* Removes -> Destroys..
 2022-01-17 23:18:41 -05:00
彭瑞暄
b8842a34ae
Update bundle_zh_TW.properties (#6470) 2022-01-17 21:58:26 -05:00
Anuken
d1206d2e2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
 2022-01-17 15:44:09 -05:00
Paweł Stolarski
6a75d84f48
Evolveye (polish translator of 3.x version) (#6502) 2022-01-17 14:53:35 -05:00
Anuken
2d19c7ae97 Bulwark shield mechanics mostly done 2022-01-17 13:39:15 -05:00
Anuken
396c087072 Experimenting with abilities 2022-01-16 22:53:58 -05:00
Anuken
b23ea8b965 WIP 'bulwark' unit 2022-01-16 16:26:21 -05:00
Anuken
e14dd00019 Quell missile weapons 2022-01-15 15:57:53 -05:00
Anuken
e563ce9dcd Erekir clouds 2022-01-14 13:11:52 -05:00
Anuken
580e830300 Erekir gen fix 2022-01-13 23:33:12 -05:00
Anuken
10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00
Anuken
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken
0ede0dbf0c 5x5 burst drill 2021-12-28 19:18:16 -05:00
Anuken
4e1dec2399 More turret cleanup 2021-12-27 16:41:03 -05:00
Anuken
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken
dd5ce7e365 Regen suppression unit + system 2021-12-27 14:46:51 -05:00
Anuken
4fbeae1afc Erekir tech sector requirements 2021-12-25 22:17:18 -05:00
Anuken
180e527a18 Beryllium wall 2021-12-24 13:23:47 -05:00
Anuken
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
Anuken
430fe2fd0a Unit assembly finalizations 2021-12-19 20:31:00 -05:00
Anuken
41b669d6e1 Unit assembly system progress 2021-12-18 11:50:21 -05:00
Anuken
3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
Anuken
e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
Anuken
00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
KuhnChris
4b6541ae4e
Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Anuken
bdc3b85346 Unit assembler progress 2021-12-13 23:14:26 -05:00
Anuken
5ac3e08b1d Tungsten walls 2021-12-13 14:42:16 -05:00
Fancy2209
b5c1972040
Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) 
* Update bundle_pt_PT.properties

* Fix the other 2 words with -/ I didn't notice
 2021-12-13 13:20:30 -05:00
Anuken
0d33768f58 WIP tank unit type 2021-12-12 18:29:44 -05:00
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
Anuken
761ee12e6f LAccess.speed / Merged #6293 2021-12-10 00:36:47 -05:00
Anuken
57e5acdbd7 Vent condenser block 2021-12-09 17:16:32 -05:00
Anuken
8a2908374a Selectable tech tree 2021-12-08 21:57:10 -05:00
Anuken
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
Anuken
5fbfe52d0a Misc bugfixes 2021-12-08 14:28:27 -05:00
Matthew (or Maya) Peng
b70c08c2ec
Removes -> Destroys (#6409) 
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
 2021-12-08 00:03:11 -05:00
Anuken
6c10a400ed Directional force projector prototype 2021-12-07 20:37:46 -05:00
Anuken
1c49bcc3b1 Added tech font attribution 2021-12-06 18:06:38 -05:00
Anuken
26692a3199 Small deconstructor 2021-12-06 14:30:54 -05:00
Anuken
7d6428fcf2 Titan recolor + complaining 2021-12-05 18:19:43 -05:00
Anuken
5103c95f2e Unfinished titan turret 2021-12-04 14:08:50 -05:00
Anuken
c8fb0c2e76 Liquids are fluids now 2021-12-03 22:28:05 -05:00
Anuken
8e4fdc92ec WIP terrible-looking regen projector 2021-12-03 20:45:19 -05:00
Anuken
61bb4d2dac Breach turret done / DrawTurret & reload fixes 2021-12-03 12:28:13 -05:00
Anuken
9c9d147b95 TeamEntry class implementation 2021-12-03 10:28:34 -05:00
Anuken
4e181d715f Pyrolysis generator + generation tweaks 2021-12-02 17:00:49 -05:00
Anuken
fff492d89d Erekir generation improvements 2021-12-02 13:25:43 -05:00
Anuken
b6988e631e arkycite floor + fixes 2021-12-01 22:38:21 -05:00
Anuken
585affeeee chemical combustion chamber 2021-12-01 19:31:59 -05:00
Anuken
e30d090a2e arkycite recolor 2021-11-30 22:52:33 -05:00
Anuken
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
Anuken
6483d924af Unit cargo transport system 2021-11-29 20:06:49 -05:00
Anuken
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
Anuken
77b3a83826 WIP animated gas 2021-11-26 21:35:58 -05:00
Anuken
616fa8748f DrawRegion spinSprite 2021-11-25 18:54:35 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Catchears
c24c5c6196
update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05:00
Anuken
78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken
211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Anuken
ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken
947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken
f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00
Build Uploader
42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729
4eb4c84b64
[RU] Update bundle (#6355) 
**Ban**dle
 2021-11-22 13:09:35 -05:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken
64efa599d0 Slag heater block 2021-11-21 14:06:18 -05:00
Anuken
0014c7a525 Slag centrifuge implementation 2021-11-21 11:59:35 -05:00
Anuken
4fcd873f65 Gallium 2021-11-20 17:59:24 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken
6026beb397 Emanate impl / Rotation lock 2021-11-17 18:02:19 -05:00
Anuken
4d13b8df7a Surge crucible effects 2021-11-17 13:37:51 -05:00
Anuken
4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken
29f8ebddb9 Sprite tweaks 2021-11-17 09:42:33 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken
8d05b878d7 oxidation chamber implementation 2021-11-16 14:54:23 -05:00
Anuken
eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken
9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Anuken
2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken
c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken
da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
Anuken
73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken
ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken
07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
hortiSquash
134ef9e00e
hortiloaders hotfix randomness (#6283) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-01 17:34:40 -04:00
Anuken
5e249e50dd Beam tower 2021-11-01 11:46:32 -04:00
Yuri Polyakov
450f651c8f
Update bundle_ru.properties (#6267) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2021-11-01 09:32:57 -04:00
NgLam is SIMP
4cbc4a0bca
Update Vietnamese translation for V7 (#6246) 2021-11-01 09:31:34 -04:00
VizardAlpha
99e7fcd2d2
Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
Anuken
0781a325c7 new core unit 2021-10-29 19:42:51 -04:00
Anuken
c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
Anuken
58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
Anuken
cd909913ca turbine condenser 2021-10-27 19:41:12 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Fernando
c15f82297d
Update bundle_pt_BR.properties (#6127) 
* Update bundle_pt_BR.properties

Add missing translations

* Update contributors

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* h

* Update bundle_pt_BR.properties
 2021-10-27 14:39:30 -04:00
Catchears
15396b6032
update german translation (#6085) 
* update german translation to 30e6bb2625

* typo
 2021-10-27 11:38:03 -04:00
彭瑞暄
75a520c3ae
Update TW translations (#6092) 2021-10-27 11:36:13 -04:00
JrTRinny
d7fd7db3cc
Update bundle_th.properties (#6187) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-27 11:26:02 -04:00
Prosta4okua
144731bfb0
Update bundle_uk_UA.properties (#6213) 2021-10-27 11:25:48 -04:00
VizardAlpha
7c1d4a092e
Update bundle_fr.properties (#6227) 2021-10-27 11:25:37 -04:00
kituta
a28ece6424
Update bundle_ja.properties (#6232) 
Add. //追加
 2021-10-27 11:25:30 -04:00
RebornTrack970
39c5c6a6f0
TR Translation (#6239) 2021-10-27 11:25:19 -04:00
Sharlotte
77975a710c
Update bundle_ko.properties (#6185) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Skskskskskk
 2021-10-27 11:25:15 -04:00
Rex
d95dc98652
Update bundle_es.properties (#6238) 
* Update bundle_es.properties

please see #6226 too.

* Update bundle_es.properties
 2021-10-27 11:25:10 -04:00
Thomas Widyantoko
7afa6a7f44
Update bundle_in_ID.properties (#6240) 
i am speed
 2021-10-27 11:25:01 -04:00
Hexrotor
65ef189921
Corrected wrong zh_CN translation (#6224) 2021-10-27 09:32:08 -04:00
Lin
5b3b2cf4d5
Update bundle_zh_CN.properties (#6216) 2021-10-27 08:38:37 -04:00
Anuken
705c85281c the vent 2021-10-26 20:34:45 -04:00
Darkness#3729
d89184da43
[RU] Translation of save search & map search (#6219) 2021-10-26 10:46:29 -04:00
Anuken
bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Anuken
f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken
a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
TranquillyUnpleasant
5c5acb2d48
Saved games search & Mapsearch filter improvements (#6194) 
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
 2021-10-22 18:14:33 -04:00
hortiSquash
c9eed5a936
horti and the better unloaders (#6201) 
* hortiloaders 0.9.8.1 seq fix

* tiny fixes
added more comments

* a tiny fix, and rewriting of a comment
 2021-10-22 10:57:16 -04:00
Anuken
9416f137cb bugfixes 2021-10-20 11:01:47 -04:00
Anuken
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
RebornTrack970
59435c8372
TR Translation, fix for 132 (#6176) 
* TR Translation, fix for 132

* Update bundle_tr.properties
 2021-10-17 15:24:10 -04:00
VizardAlpha
fc9abeb908
Update bundle_fr.properties (#6172) 
* Update bundle_fr.properties

More branch merging.. Commits and more..

* Added logic variable display window
 2021-10-17 15:23:59 -04:00
Prosta4okua
ea3802bfc7
Update bundle_uk_UA.properties (#6180) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-10-17 15:23:50 -04:00
Darkness#3729
d970eb45e3
Lol (#6171) 2021-10-16 12:45:16 -04:00
Anuken
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Sharlotte
06bf2711a4
Update [KO] bundles once again (#6147) 
* Why did you marge this

* Update bundle_ko.properties
 2021-10-16 09:49:58 -04:00
Yuri Polyakov
91acda56c1
[RU] New blocks translated (#6159) 
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
 2021-10-16 09:49:37 -04:00
JrTRinny
0f29a01292
Update bundle_th.properties (#6162) 2021-10-16 09:46:27 -04:00
Anuken
56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -04:00
Anuken
b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
itsragedev
d5babe88e3
Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken
d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
BorisA11
bf8276f501
Serbian translation of all blocks (#6129) 
all blocks are now translated, meaning the game should be more playable on this language
block descriptions are not yet done
 2021-10-12 15:36:29 -04:00
Yuri Polyakov
1fc3974e1b
[RU] Minor translation of some lines (#6016) 
* [RU] Minor translation of some lines

Translated 3 lines. That's all for now ...

* [RU] Editor translate

bruh

* [RU] Editor translate (2)

* [RU] Editor translate

bruh2

* update

* update 2
 2021-10-12 15:34:51 -04:00
Sharlotte
c857c8a438
Update bundle_ko.properties (#5984) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2021-10-12 15:21:48 -04:00
Anuken
5b9e11cc6c
Revert "Update this bundle (#6081)" (#6143) 
This reverts commit 10b1ce2a3d.
 2021-10-12 15:18:56 -04:00
GuestUser25
10b1ce2a3d
Update this bundle (#6081) 2021-10-12 15:18:25 -04:00
Angel-24
5b3ae4ae15
[ES] Updated spanish translation (#6031) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Updated line 125

Remove suggestion of changing auto-disabling mods setting when the game crashes, just what Anuke did in the original bundle.
 2021-10-12 14:16:22 -04:00
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Darkness#3729
8468214dd7
Another translate and typo fix (#6115) 
* Update bundle_ru.properties

* Another typo and some translation

* Also this

* And hint

* Bruh
 2021-10-10 10:29:58 -04:00
GlennFolker
758921c077
Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
MrSampleJay
c22ede229e
Update bundle_fil.properties (#6128) 
Translated item description from copper to surge
 2021-10-09 17:15:43 -04:00
Wojtek G
1ca6db9cf5
Update bundle_pl.properties (#5206) 
[tutorial] changed "Poradnik" (Guide) to "Samouczek" (Tutorial) for consistency 

[command.rally] changed "Zbierz" (Sounds more like collecting something) to "Zbiórka" (Sounds more like gathering units together)
 2021-10-09 14:08:44 -04:00
BorisA11
dc7ffbc8b8
The partial Serbian language translation (#6118) 
* The partial Serbian language translation

Since all south-slavic langauges are very similar, this would also be usable by Croats, Bosnians, etc. The translation is not yet fully completed, many things are still not done, but I will propose this as it is now, then finish it up later, if possible.

* typo

typed rs instead of sr

* typo 2

ohno

* more unit descriptions

* more translations - over 100 more lines are done

* more translations

more complete translations
 2021-10-08 18:11:54 -04:00
kituta
f9da6f8904
Update bundle_ja.properties (#6121) 
Add. //追加しました
 2021-10-08 18:11:19 -04:00
Darkness#3729
200aa3e32b
Typo (#6114) 2021-10-07 12:47:52 -04:00
Anuken
083321d6c7 Merge remote-tracking branch 'origin/master' 2021-10-07 12:07:32 -04:00
Anuken
00be5b7fa5 Converted soundtrack to ogg 2021-10-07 12:07:26 -04:00
SoMall-dumpling
55537f09dc
Torpedos->Torpedoes (#6113) 
Typo, yes.
 2021-10-07 09:32:24 -04:00
Darkness#3729
6e3de78026
[RU] Unit descriptions and more (#6110) 
* Небольшое обновление бандла

* Перевод криогенной жидкости, а так же поиска карт

* Надо ещё оксиное перевести

* Добавил описание Оксино

* Убрал ненужное
 2021-10-06 10:23:32 -04:00
JrTRinny
17af905d52
Update bundle_th.properties (#6036) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-05 22:18:18 -04:00
VizardAlpha
f2139fad6e
Update bundle_fr.properties (#6035) 
* Update bundle_fr.properties

* Adding new commits

* Don't suggest changing the mod disable option

* ....
 2021-10-05 22:18:06 -04:00
Anuken
10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
 2021-10-01 09:41:33 -04:00
Anuken
b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
Yuri Polyakov
558fb26dcb
Update bundle_ru.properties (#6078) 
б
 2021-09-30 13:03:28 -04:00
Anuken
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
 2021-09-28 18:45:09 -04:00
Anuken
c6c374f672 Merge remote-tracking branch 'origin/master' 2021-09-28 11:28:58 -04:00
Anuken
d226ffe633 Fixed #6071 2021-09-28 11:28:53 -04:00
TranquillyUnpleasant
366822e4d1
Remove unused variable (#6063) 
This got leftover from some other shader testing I did.
 2021-09-27 22:25:22 -04:00
SoMall-dumpling
30e6bb2625
Retusa Description Change (#6061) 
Now that Retusa has been remaked, the description needs to be changed too.
 2021-09-27 19:11:48 -04:00
Anuken
61a28aca91 Cryofluid floor tweaks 2021-09-27 15:07:10 -04:00
Anuken
7c00b54191 hgdf 2021-09-27 14:51:50 -04:00
TranquillyUnpleasant
dbd31b9031
Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
TranquillyUnpleasant
bf89ef1e5e
Map search (#6004) 
* Map search

* Fix format

* check and continue

* icons and style

* grow pane so search bar doesnt move

* Inline focusing

* Use boolean instead of checking size
 2021-09-27 11:33:12 -04:00
Anuken
6d41b894ab Slight difficulty increase of Desolate Rift 2021-09-22 19:21:58 -04:00
Anuken
bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Kowkodivka
e4e1bac2aa
[RU] Multiplayer translate (#6014) 
Перевел строчку "servers.local.steam = Open Games & Local Servers".
 2021-09-17 21:39:49 -04:00
Anuken
61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken
01771c5288 Merge remote-tracking branch 'origin/master' 2021-09-17 11:46:58 -04:00
Anuken
58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Kowkodivka
effd226c3e
[RU] Settings translate (#6013) 
Перевел 2 строчки в настройках графики.
 2021-09-17 11:33:46 -04:00
Kowkodivka
8ccca23a24
Update bundle_ru.properties (#6012) 
Translated "status.overdrive.name"
 2021-09-17 10:16:03 -04:00
Anuken
18d34c5854 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 14:18:24 -04:00
Anuken
0756da0dd1 Fixed shader warnings 2021-09-16 12:41:45 -04:00
Anuken
a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken
845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -04:00
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Darkness#3729
248f59131b
[RU] Translation of all latest bundles (#5985) 
* [RU] Translation of all latest bundles

* Also this line

* Update bundle_ru.properties

* Fix
 2021-09-14 12:52:19 -04:00
Rex
be0397355f
br (#5990) 2021-09-13 21:08:42 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Rex
d36a00a6fe
update bundle_es.properties (#5989) 
* Update bundle_es.properties

* Update bundle_es.properties

* 131

* support units

* fixed
 2021-09-13 20:08:40 -04:00