mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-07 14:01:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2020-12-02 09:56:06 -05:00
commit 395f7193ea
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -1473,7 +1473,7 @@ unit.zenith.description = Fires salvos of missiles at all nearby enemies.
unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
unit.mono.description = Automatically mines copper and lead, depositing it into the core.
unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction.
unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction.
unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.

2
core/src/mindustry/entities/bullet/LaserBoltBulletType.java
View File

@ -6,7 +6,7 @@ import mindustry.gen.*;
import mindustry.content.*;
public class LaserBoltBulletType extends BasicBulletType{
protected float height = 7f, width = 2f;
public float width = 2f, height = 7f;
public LaserBoltBulletType(float speed, float damage){
super(speed, damage);

2
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@ -242,7 +242,7 @@ public class MassDriver extends Block{
@Override
public boolean acceptItem(Building source, Item item){
//mass drivers that ouput only cannot accept items
//mass drivers that output only cannot accept items
return items.total() < itemCapacity && linkValid();
}

8
fastlane/metadata/steam/english/achievements.vdf
View File

@ -56,21 +56,21 @@
"NEW_ACHIEVEMENT_21_3_NAME" "Swarm"
"NEW_ACHIEVEMENT_21_3_DESC" "Have 100 units active at once."
"NEW_ACHIEVEMENT_21_4_NAME" "Flock"
"NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Phantom Poly drones active at once."
"NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Poly drones active at once."
"NEW_ACHIEVEMENT_21_5_NAME" "Roboticist"
"NEW_ACHIEVEMENT_21_5_DESC" "Build every type of unit."
"NEW_ACHIEVEMENT_21_6_NAME" "Legions"
"NEW_ACHIEVEMENT_21_6_DESC" "Build 1000 units total."
"NEW_ACHIEVEMENT_21_9_NAME" "You Should've Listened"
"NEW_ACHIEVEMENT_21_9_DESC" "Die in the drop point exclusion zone."
"NEW_ACHIEVEMENT_21_10_NAME" "There are naval units for that."
"NEW_ACHIEVEMENT_21_10_NAME" "There Are Naval Units For That"
"NEW_ACHIEVEMENT_21_10_DESC" "Drown."
"NEW_ACHIEVEMENT_21_11_NAME" "Collector"
"NEW_ACHIEVEMENT_21_11_DESC" "Fill the core to maximum capacity with every type of material."
"NEW_ACHIEVEMENT_21_12_NAME" "Crowd"
"NEW_ACHIEVEMENT_21_12_DESC" "Host a server with 10 players on it."
"NEW_ACHIEVEMENT_21_13_NAME" "Invulnerable"
"NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown and, Spectre and Foreshadow.."
"NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown, Spectre and Foreshadow."
"NEW_ACHIEVEMENT_21_14_NAME" "Liftoff"
"NEW_ACHIEVEMENT_21_14_DESC" "Use the Launch Pad."
"NEW_ACHIEVEMENT_21_16_NAME" "Heresy"
@ -90,7 +90,7 @@
"NEW_ACHIEVEMENT_21_23_NAME" "Ignition"
"NEW_ACHIEVEMENT_21_23_DESC" "Power up an Impact Reactor."
"NEW_ACHIEVEMENT_21_24_NAME" "Acceleration"
"NEW_ACHIEVEMENT_21_24_DESC" "Activate the Interplanteary Accelerator."
"NEW_ACHIEVEMENT_21_24_DESC" "Activate the Interplanetary Accelerator."
"NEW_ACHIEVEMENT_21_25_NAME" "The Spiral"
"NEW_ACHIEVEMENT_21_25_DESC" "Round and round it goes..."
"NEW_ACHIEVEMENT_21_26_NAME" "Escalation"

4
fastlane/metadata/steam/english/description.txt
View File

@ -43,10 +43,10 @@
[list]
[*] 16 built in maps for custom games, in addition to campaign
[*] Play Co-op, PvP or sandbox
[*] Play co-op, PvP or sandbox
[*] Join a public dedicated server, or invite friends to your own private session
[*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more
[*] Mix&match gamemodes: Combine PvP and PvE gamemodes together
[*] Mix & match gamemodes: Combine PvP and PvE gamemodes together
[/list]
[h2]Custom Map Editor[/h2]