mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,712 Commits 4 Branches 160 Tags 2.3 GiB
44c47586a7
Commit Graph

12712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Anuken
d5f7fc842c Fixed #6140 2021-10-12 08:25:00 -04:00
Anuken
da0fea5186 Merge remote-tracking branch 'origin/master' 2021-10-11 10:30:44 -04:00
Anuken
6abb458c27 Increased world stream chunk size 2021-10-11 10:30:40 -04:00
GlennFolker
9cc738d867
order (#6137) 2021-10-11 09:03:42 -04:00
Nalrahc
171e348b49
Update achievements.vdf (#5536) 
L37 : "Créer une nouvelle carte 10 fois" could have been understood as "Edit the same map 10 times".
L113 : "Contrôller" is a typo
 2021-10-10 20:51:41 -04:00
VizardAlpha
3c071bcf49
Create Summary.txt (#5400) 
* Create Summary.txt

* Create changelogs

* Delete changelogs

* Update description.txt steam

* Update summary

Co-authored-by: Anuken <arnukren@gmail.com>
 2021-10-10 20:50:23 -04:00
Matthew Peng
4030e71b31
Customizable Force Projector Absorb Effect (#6102) 
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
 2021-10-10 17:06:59 -04:00
Anuken
9f070323c2 a 2021-10-10 14:11:12 -04:00
Anuken
8ae70f5f9a Merge remote-tracking branch 'origin/master' 2021-10-10 14:04:13 -04:00
Anuken
f5cb6f2542 Fixed arguments resetting red in server errors 2021-10-10 14:04:08 -04:00
VizardAlpha
871fcc9579
Update achievements.vdf (#4987) 
Minor correction and small translation ...
 2021-10-10 13:52:19 -04:00
Anuken
a9bb8b1310
Update TRANSLATING.md 2021-10-10 13:47:44 -04:00
Parkurist
b955539383
[TR] Translation of Steam and Google Play game descriptions and achivements (#5420) 
* Create full_description.txt

* Create short_description.txt

* Create summary.txt

* Create title.txt

* Create 100.1.txt

* Delete 100.1.txt

* Create description.txt

* Create short_description.txt

* draft

* [TR] Translated all of the Steam achivements
 2021-10-10 13:40:59 -04:00
VizardAlpha
8f8e038575
Update description.txt (#4986) 
* Update description.txt

Minor correction and small translation ...

* Update description.txt
 2021-10-10 13:38:37 -04:00
Anuken
b2de197050 Merge remote-tracking branch 'origin/master' 2021-10-10 12:37:11 -04:00
Anuken
c60bd6f0dc Customizable chat formatting (Closes #5387) 2021-10-10 12:37:07 -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
Anuken
919db8cc76 Merge remote-tracking branch 'origin/master' 2021-10-10 10:24:16 -04:00
Anuken
5ce5f347aa Jitpack gradle tweak 2021-10-10 10:24:10 -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
buthed010203
c5ed535519
add javaPath variable (#6126) 2021-10-09 14:07:56 -04:00
Fernando
6c86a64c74
Update servers_v6.json (#6125) 
remove modded server
 2021-10-09 13:13:23 -04:00
Anuken
d24f7cb549 Merge remote-tracking branch 'origin/master' 2021-10-09 12:54:26 -04:00
Anuken
f5d6313399 Redundant effect paren cleanup 2021-10-09 12:54:20 -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
Anuken
1ada42738f Merge remote-tracking branch 'origin/master' 2021-10-07 14:35:13 -04:00
Anuken
04df23b88a Generation tweaks 2021-10-07 14:35:09 -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
Anuken
d43157fd22 Fixed negative recoil 2021-10-06 13:29:31 -04:00
Anuken
60a430025a Merge remote-tracking branch 'origin/master' 2021-10-06 13:09:53 -04:00
Anuken
3f53315a07 Proper implementation of #6099 (untested) 2021-10-06 13:09:45 -04:00
Darkness#3729
6e3de78026
[RU] Unit descriptions and more (#6110) 
* Небольшое обновление бандла

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

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

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

* Убрал ненужное
 2021-10-06 10:23:32 -04:00
Matthew Peng
a4963f351d
Fix negative recoil (#6107) 2021-10-05 23:05:33 -04:00
Anuken
df5c31a0e7
Update SERVERLIST.md 2021-10-05 22:22:27 -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
19b881561f slurp 2021-10-05 21:46:41 -04:00
Anuken
785ba7910d Merge remote-tracking branch 'origin/master' 2021-10-05 17:06:17 -04:00
Anuken
3030308f09 Make naval units only slow down on "shallow" water 2021-10-05 17:06:09 -04:00
Darkness#3729
4ed471f77b
Change server port (#6105) 
:-/
 2021-10-05 13:42:06 -04:00
maxutka99
373c73f492
Update servers_v7.json (#6079) 
* Update servers_v7.json

* Update servers_v7.json

* Update servers_v7.json
 2021-10-05 13:00:11 -04:00
Matthew Peng
bc3da30d45
Allow for dynamic laser absorption and insulation (#5047) 
* Allow for dynamic laser absorption

* Might as well do insulated as well

* null checks are important
 2021-10-05 12:36:29 -04:00
Anuken
56fe1bfa68 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-10-05 12:08:58 -04:00