Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,853 Commits 4 Branches 180 Tags
78437851825293a9bd5058fcc478f2460bba5e21
Commit Graph

4681 Commits

Author SHA1 Message Date
Anuken
705c85281c the vent 2021-10-26 20:34:45 -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