mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 09:54:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,425 Commits 4 Branches 160 Tags 2.3 GiB
a2c73a748e
Commit Graph

15425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phinner
ec48504bd2
French Translation: The end of the trilogy (#7434) 
* hello again

* smol but nice changes

* partial merge of #7293

The dude seems to be inactive so...

* zeta edits

* zeta edits 2

* zeta edits 3

* smol edits

* new unit translations

* many thanks xorblo-doitus

* praise language tool :)

* tiny fixes
 2022-08-29 12:40:08 -04:00
Anuken
74697a389c Updated bundles with new descriptions 2022-08-29 12:23:44 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Anuken
cef63bae3a Merge remote-tracking branch 'origin/master' 2022-08-28 16:08:15 -04:00
Anuken
d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -04:00
Angel-24
f5a426bc12
Update bundle_es.properties (#7467) 
Fixed a little misapprehension.
 2022-08-28 08:18:05 -04:00
Nunting
32a8472b20
Update bundle_ko.properties (#7464) 
* Update bundle_ko.properties

Not done

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-08-28 08:15:20 -04:00
Github Actions
21ce48c5b5 Automatic bundle update 2022-08-27 23:47:07 +00:00
Anuken
2f45bb596b Merge remote-tracking branch 'origin/master' 2022-08-27 19:46:00 -04:00
Anuken
ff3a1c23c2 Removed unmerged PR leftovers for now 2022-08-27 19:45:56 -04:00
MEEPofFaith
cf0c7ff2d8
"Arkycite Floor" -> "Arkycite" (#7462) 2022-08-27 19:44:33 -04:00
Github Actions
b511a37a04 Automatic bundle update 2022-08-27 23:40:50 +00:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
RTOmega
4bc813a203
Added CastleWars V7 (#7461) 2022-08-27 13:50:15 -04:00
router
91440e7055
drill mined item sensing (#7460) 
* add drill sensing

* PROPERLY
 2022-08-27 11:18:14 -04:00
Epowerj
9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
Epowerj
53ed4dd072 Tweaks to basin 2022-08-26 12:27:11 -04:00
Mythril382
32c8167b7c
drawSelect for RepairTower (#7447) 2022-08-26 08:07:59 -04:00
RTOmega
80d772b96e
TR Bundle Update (erekir units) (#7449) 
* TR Bundle Update

* güncerleme -> sürüm güncerlemesi

* Editor Translation Fix + Eleman -> Birim

* mini fixes

* Unit desc

* kumdan

* Update bundle_tr.properties
 2022-08-26 08:07:07 -04:00
Anuken
82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken
3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken
8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
xStaBUx
47d335b629
Better Discord dialog (#7445) 2022-08-25 14:46:49 -04:00
Epowerj
9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Epowerj
8bc05be30e Tweaks on peaks :) 2022-08-25 01:13:34 -04:00
Epowerj
b8349bae19 Tweaks on peaks :) 2022-08-25 00:53:49 -04:00
Anuken
276a59b874 Fixed #7441 2022-08-25 00:49:11 -04:00
Epowerj
c6ec64cde2 Changed ship refabricator research cost 2022-08-25 00:02:49 -04:00
Epowerj
07d7eda4c8 Chemical combustion chamber buff 2022-08-24 22:08:43 -04:00
Anuken
7a8155965a Merge remote-tracking branch 'origin/master' 2022-08-24 22:08:15 -04:00
Anuken
550d76e372 Minor shockwave tower buff 2022-08-24 22:08:10 -04:00
Epowerj
a2dbe20885 Made citadel core locked behind peaks for now 2022-08-24 21:57:36 -04:00
Epowerj
3b239ee368 Changed sublimate research requirements 2022-08-24 21:56:46 -04:00
Epowerj
94690b6edd Tweaks to marsh 2022-08-24 21:49:13 -04:00
Github Actions
7b63ec203e Automatic bundle update 2022-08-24 17:49:15 +00:00
OSP
cc15703e2d
XCore ip change (#7440) 2022-08-24 13:48:22 -04:00
MEEPofFaith
7ac00d0aaf
Move damageMultiplier to BulletType (#7436) 
* Move bullet damage multiplier to bulletType

* Is this better?

I don't know much about optimization, is this any better than before?

* Revert "Is this better?"

This reverts commit b83723701f.
 2022-08-24 13:48:06 -04:00
Anuken
3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Github Actions
bef1b51ed2 Automatic bundle update 2022-08-24 14:39:08 +00:00
Anuken
eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
Anuken
e284be8be4 Fixed #7438 2022-08-24 10:27:49 -04:00
Epowerj
4ed4399e54 Progress on peaks 2022-08-23 23:09:43 -04:00
Anuken
1dc910afe9 Merge remote-tracking branch 'origin/master' 2022-08-23 09:10:20 -04:00
Anuken
ebf2094950 LaserTurret sound fix 2022-08-23 09:10:15 -04:00
- MV -
f0300dcdde
TRANSLATION (it) (#7381) 2022-08-23 08:33:46 -04:00
Tima_Happy
cb5e784fcc
Moving CyanDustry into EradicationDustry (#7426) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v7.json

* Update servers_v7.json
 2022-08-23 08:11:11 -04:00
Anuken
d2894a14a0
Update servers_v7.json 2022-08-23 08:09:29 -04:00
MEEPofFaith
0cc1f97450
Fix non-continuous bullets being removed (#7423) 2022-08-23 08:04:35 -04:00