Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,247 Commits 4 Branches 180 Tags
677abf4924d9dfffb8c0de10cbf66b91f1ba5e94
Commit Graph
13247 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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#3729andGitHub 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
GlennFolkerandGitHub 758921c077 Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
MrSampleJayandGitHub c22ede229e Update bundle_fil.properties (#6128) 
Translated item description from copper to surge
 2021-10-09 17:15:43 -04:00
Wojtek GandGitHub 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
buthed010203andGitHub c5ed535519 add javaPath variable (#6126) 2021-10-09 14:07:56 -04:00
FernandoandGitHub 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
BorisA11andGitHub 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
kitutaandGitHub 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#3729andGitHub 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-dumplingandGitHub 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#3729andGitHub 6e3de78026 [RU] Unit descriptions and more (#6110) 
* Небольшое обновление бандла

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

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

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

* Убрал ненужное
 2021-10-06 10:23:32 -04:00
Matthew PengandGitHub a4963f351d Fix negative recoil (#6107) 2021-10-05 23:05:33 -04:00
AnukenandGitHub df5c31a0e7 Update SERVERLIST.md 2021-10-05 22:22:27 -04:00
JrTRinnyandGitHub 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
VizardAlphaandGitHub 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#3729andGitHub 4ed471f77b Change server port (#6105) 
:-/
 2021-10-05 13:42:06 -04:00
maxutka99andGitHub 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 PengandGitHub 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
FatonndevandGitHub 77736f227f New domain name (#6076) 
* new domain name

* moved to new domain
 2021-10-04 14:39:55 -04:00
way-zerandGitHub 6d49bd39be Fix #5702 (#6098) 2021-10-04 09:21:02 -04:00
Anuken 0d0fe394d3 Serpulo water tweaks 2021-10-03 13:12:20 -04:00
Anuken aed57aaac3 Added InputHandler lock system 2021-10-03 11:21:53 -04:00
Anuken b20cdb97c5 Reset chat font cache color 2021-10-02 13:01:54 -04:00
Anuken d95662233c Fixed #6090 2021-10-02 12:05:02 -04:00
Anuken ce7e91f17b Merge remote-tracking branch 'origin/master' 2021-10-02 08:42:12 -04:00
Anuken db6b8abce6 Fixed #6089 2021-10-02 08:42:07 -04:00
Anuken 8c685eaedb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-10-01 19:01:52 -04:00
Vajda SimonandGitHub 3e2da3595f Update servers_v6.json (#6084) 2021-10-01 13:47:32 -04:00
Anuken 60fe1e5570 arc 2021-10-01 12:10:50 -04:00
Anuken 67ed6ddd18 arc 2021-10-01 09:44:45 -04:00
Anuken b2cd4e8ec0 resizeCheck fix 2021-10-01 09:43:20 -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