mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-18 17:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source 
# Conflicts:
#	src/main/resources/META-INF/accesstransformer.cfg
This commit is contained in:
grimmauld 2020-10-21 01:03:58 +02:00
commit 7f643b9fe3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
View file

@ -136,7 +136,7 @@ public class ChromaticCompoundItem extends Item {
BeaconTileEntity bte = (BeaconTileEntity) te;
if (!bte.getBeamSegments().isEmpty()) isOverBeacon = true;
if (bte.getLevels() != 0 && !bte.beamSegments.isEmpty()) isOverBeacon = true;
break;
}

3
src/main/resources/META-INF/accesstransformer.cfg
View file

@ -24,3 +24,6 @@ public net.minecraft.world.server.ChunkManager field_219266_t # field_219266_t
public net.minecraft.world.biome.BiomeManager field_226833_b_ # seed
public net.minecraft.client.renderer.ItemRenderer field_175057_n # textureManager
# Beacon
public net.minecraft.tileentity.BeaconTileEntity field_174909_f # beamSegments