Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,328 Commits 4 Branches 180 Tags
a68c17d876540fe6e8f1d65b41fd1053c82d7e57
Commit Graph
5531 Commits
Author SHA1 Message Date
Patrick 'Quezler' Mounier 5f047603bf Revert "Blend prototype" 
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
 2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier 5c485eff04 Ressurect OG corner 2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier 0f2f8f2411 Revert "Stash cursed loading dock" 
This reverts commit 9bdf475049.
 2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier 9bdf475049 Stash cursed loading dock 2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier 35afc94d34 Blend prototype 2020-01-08 10:27:06 +01:00
RasangusandAnuken 44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken 3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Patrick 'Quezler' Mounier 9b55eeaa38 Rename batches to something simpler 2020-01-06 18:04:56 +01:00
Patrick 'Quezler' Mounier 1a177ef239 Rephase dotted 2020-01-06 18:00:43 +01:00
Patrick 'Quezler' Mounier 207d95dbd8 Refractor away throughput stat 2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier 6b3dc669eb Merge branch 'master' into crater 2020-01-06 17:37:47 +01:00
Anuken 854e69322b Merge remote-tracking branch 'origin/master' 2020-01-06 08:38:13 -05:00
Anuken 03286b29e8 Changed Cyrillic font 2020-01-06 08:37:19 -05:00
Daniel DušekandAnuken 9d9e31948d Add - tutorial localized, description coverage++, fix broken translations (#1327) 2020-01-05 17:41:41 -05:00
Patrick 'Quezler' Mounier c6299c8f2c Add throughput stat entry 2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier 095c65f36c Remove crater from bundle 2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier e2d0ab5161 Move bundle entries around 2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier 73040de839 Change bundle description 2020-01-03 17:41:05 +01:00
Patrick 'Quezler' Mounier f6af699428 Revert "🎩" 
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
 2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier 0b0007502f Revert "Differentiate texture from armored conveyor" 
This reverts commit 59451fcc0b.
 2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier 59451fcc0b Differentiate texture from armored conveyor 
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
 2020-01-03 17:09:06 +01:00
VanguardandGitHub 2e114d09ea 22 changed lines 
mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description
 2020-01-03 07:27:50 +03:00
Patrick 'Quezler' Mounier f0bfe24008 Remove crater bundle entry 2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier 0ae6527584 Sacrifice hivemind to convert craters to drawings 
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
 2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier 10e4268dd5 🎩 
Leaving this here until it gets merged or something :)
 2020-01-02 09:02:37 +01:00
VanguardandGitHub b44b0f9992 3 changed lines 
quit.confirm.tutorial
setting.coreselect.name
public.confirm
 2020-01-01 18:41:21 +03:00
Patrick 'Quezler' Mounier 1bcfc69206 Tweak stat pages 2020-01-01 14:01:54 +01:00
Patrick 'Quezler' Mounier c3186b63ce Rename compression to plastanium 
Breaking change.
 2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier 830f67e001 Merge branch 'master' into crater 2019-12-31 17:31:09 +01:00
CinExPLandAnuken 62947b9417 Update bundle_pl.properties (#1285) 
- reverted back some changes made by @FarmerThanos,
- fixed some errors,
- compared to english file.
 2019-12-30 23:03:46 -05:00
Patrick 'Quezler' Mounier bf9207fe4e Merge branch 'master' into crater 2019-12-30 10:55:06 +01:00
Patrick 'Quezler' Mounier 56351b427b Revert "Attempt to remove unused regions" 
This reverts commit 4f5b737f7c.
 2019-12-30 10:53:50 +01:00
Patrick 'Quezler' Mounier 4f5b737f7c Attempt to remove unused regions 
Failed, conveyor code depends to much on it, gonna revert this.
 2019-12-30 10:53:45 +01:00
FarmerThanosandAnuken 565064cd64 Updated bundle_pl.properties (#1273) 
* Updated bundle_pl.properties

Corrected some translations, translated some options and added a description to the Battery Diode.

* Update bundle_pl.properties

Reverted some changes
 2019-12-29 18:52:44 -05:00
Petr GašparíkandAnuken 9d2e356996 Update bundle_cs.properties (#1267) 
Rewamping Czech translation. First part.
 2019-12-29 18:52:06 -05:00
Ali-C-IlaandAnuken ae5685ae46 Update bundle_zh_TW.properties (#1263) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-29 18:51:58 -05:00
Predator127andAnuken 2b46b0e38e Update bundle_pt_BR.properties (#1253) 
* Update bundle_pt_BR.properties

Hi there! my name is Zero! also known as Hanko, I've translated for a long time since then.
I've been lookin through the new translations since i've been out for quite a long time, but dont think i forgot that i was a translator!

* Update bundle_pt_BR.properties
 2019-12-29 18:51:52 -05:00
GioIacca9andAnuken e200dcee33 Update bundle_it.properties (#1240) 2019-12-29 18:51:45 -05:00
PlayerBrasil13andAnuken fe63b46b67 Update bundle_pt_BR.properties (#1232) 2019-12-29 18:51:37 -05:00
SpiffyBadGasterandAnuken 698e83a28a Make translation better (#1222) 
* Make translation better

* Make something better

* Fix that javaline

* Make Translate better

Not finish

* Make Translate better

Not finish
 2019-12-29 18:51:30 -05:00
Prosta4okuaandAnuken 150d0bf513 [WIP]Update bundle_uk_UA.properties (#1220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* 17.12.2019
 2019-12-29 18:51:22 -05:00
Prosta4okuaandAnuken 5af7cd1d55 Update bundle_uk_UA.properties (#1275) 2019-12-29 18:50:59 -05:00
VanguardandGitHub 616867b4b9 9 new lines, 1 changed line 
New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy
 2019-12-30 02:47:49 +03:00
Anuken 670f085f78 New, improved minimap / Bugfixes 2019-12-29 17:56:10 -05:00
Patrick 'Quezler' Mounier 20a511d940 Merge branch 'master' into crater 2019-12-29 20:50:55 +01:00
Anuken 6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Patrick 'Quezler' Mounier 326f75cbda Merge branch 'master' into crater 2019-12-29 19:09:27 +01:00
Anuken 566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken 730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken 8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00