icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
This commit is contained in:
gnembon committed 2019-12-10 23:14:04 -04:00
2 parents cc9cc17b27 55065a38a6
commit 8f9dd66cdf
84 files changed
+102 -88
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetExpression.java
+1 -1
View File
@@ -21,7 +21,7 @@ import carpet.script.value.NullValue;
import carpet.script.value.NumericValue;
import carpet.script.value.StringValue;
import carpet.script.value.Value;
import carpet.settings.CarpetSettings;
import carpet.CarpetSettings;
import carpet.utils.BlockInfo;
import carpet.utils.Messenger;
import com.google.common.collect.Sets;
src/main/java/carpet/script/CarpetScriptHost.java
+1 -1
View File
@@ -8,7 +8,7 @@ import carpet.script.value.FunctionValue;
import carpet.script.value.NumericValue;
import carpet.script.value.StringValue;
import carpet.script.value.Value;
import carpet.settings.CarpetSettings;
import carpet.CarpetSettings;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
src/main/java/carpet/script/CarpetScriptServer.java
+1 -1
View File
@@ -4,7 +4,7 @@ import carpet.script.bundled.BundledModule;
import carpet.script.value.FunctionValue;
import carpet.script.value.MapValue;
import carpet.script.value.StringValue;
import carpet.settings.CarpetSettings;
import carpet.CarpetSettings;
import carpet.CarpetServer;
import carpet.script.bundled.FileModule;
import carpet.script.bundled.ModuleInterface;