Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into crater

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 10:00:02 +01:00
parent 4bb9a93ff9 0534a4da45
commit e5e4884448
656 changed files with 3579 additions and 1832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -1129,13 +1129,13 @@ public class Blocks implements ContentList{
differentialGenerator = new SingleTypeGenerator("differential-generator"){{
requirements(Category.power, ItemStack.with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50));
powerProduction = 16f;
itemDuration = 120f;
itemDuration = 140f;
hasLiquids = true;
hasItems = true;
size = 3;
consumes.item(Items.pyratite).optional(true, false);
consumes.liquid(Liquids.cryofluid, 0.18f);
consumes.liquid(Liquids.cryofluid, 0.15f);
}};
rtgGenerator = new DecayGenerator("rtg-generator"){{