fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fabric/master

Browse Source 
# Conflicts:
#	src/main/java/appeng/core/api/definitions/ApiItems.java
This commit is contained in:
Sebastian Hartte
2020-09-09 02:25:15 +02:00
parent 17648633fe bcee2ec427
commit a521e827db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/definitions/ApiItems.java
+1 -1
View File
@@ -318,7 +318,7 @@ public final class ApiItems implements IItems {
GrowingCrystalEntity.TYPE = registry GrowingCrystalEntity.TYPE = registry
.<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, SpawnGroup.MISC) .<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, SpawnGroup.MISC)
.customize(builder -> builder.dimensions(EntityDimensions.fixed(0.25F, 0.25F))).build(); .customize(builder -> builder.dimensions(EntityDimensions.fixed(0.25F, 0.4F))).build();
// rv1 // rv1
this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new) this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new)