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

Cleaned up diode

Browse Source
This commit is contained in:
Anuken 2019-11-11 23:32:49 -05:00
parent f5c1eb74af
commit 56917483d6
12 changed files with 2110 additions and 2108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/power/diode-arrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 679 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
core/assets-raw/sprites/blocks/power/diode.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
core/assets/sprites/block_colors.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 741 B

After

Width:  |  Height:  |  Size: 739 B

4210
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 931 KiB

After

Width:  |  Height:  |  Size: 720 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 KiB

After

Width:  |  Height:  |  Size: 278 KiB

BIN
core/assets/sprites/sprites3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 260 KiB

BIN
core/assets/sprites/sprites4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 134 KiB

BIN
core/assets/sprites/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 KiB

After

Width:  |  Height:  |  Size: 888 KiB

2
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -1066,7 +1066,7 @@ public class Blocks implements ContentList{
}};
diode = new PowerDiode("diode"){{
requirements(Category.power, ItemStack.with(Items.silicon, 10, Items.phasefabric, 5, Items.plastanium, 2, Items.metaglass, 1));
requirements(Category.power, ItemStack.with(Items.silicon, 10, Items.plastanium, 5, Items.metaglass, 10));
}};
battery = new Battery("battery"){{

4
core/src/io/anuke/mindustry/content/TechTree.java
View File

@ -215,8 +215,10 @@ public class TechTree implements ContentList{
node(combustionGenerator, () -> {
node(powerNode, () -> {
node(powerNodeLarge, () -> {
node(surgeTower, () -> {
node(diode, () -> {
node(surgeTower, () -> {
});
});
});

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=22534a12fc0d39eee77e1369c043444999a4e725
archash=900a4966bf9b05272c8b0c258dc534540c0628fb