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
12,928 Commits 4 Branches 160 Tags 2.3 GiB
5e249e50dd
Commit Graph

4701 Commits

Author SHA1 Message Date
Anuken
5e249e50dd Beam tower 2021-11-01 11:46:32 -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