mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-11 13:04:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mc1.14-v0.2.2' into mc1.15-v0.2.2

Browse Source 
Conflicts:
	build.gradle
This commit is contained in:
tterrag 2020-03-29 00:08:49 -04:00
commit 3e82cf6a90
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/simibubi/create/modules/logistics/RedstoneLinkNetworkHandler.java
View File

@ -95,7 +95,7 @@ public class RedstoneLinkNetworkHandler {
continue; continue;
} }
World world = actor.getWorld(); World world = actor.getWorld();
if (world.isBlockPresent(other.tileEntity.getPos())) { if (!world.isBlockPresent(other.tileEntity.getPos())) {
iterator.remove(); iterator.remove();
continue; continue;
} }

2
src/main/resources/META-INF/mods.toml
View File

@ -4,7 +4,7 @@ loaderVersion="[28,)"
[[mods]] [[mods]]
modId="create" modId="create"
version="mc1.14-0.2.2" version="mc1.14-0.2.2a"
displayName="Create" displayName="Create"
#updateJSONURL="" #updateJSONURL=""
authors="simibubi" authors="simibubi"

4
src/main/resources/assets/create/lang/en_us.json
View File

@ -859,9 +859,11 @@
"block.create.turntable.tooltip.summary": "Turns _Rotational_ _Force_ into refined Motion Sickness.", "block.create.turntable.tooltip.summary": "Turns _Rotational_ _Force_ into refined Motion Sickness.",
"block.create.millstone.tooltip": "MILLSTONE", "block.create.millstone.tooltip": "MILLSTONE",
"block.create.millstone.tooltip.summary": "A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom.", "block.create.millstone.tooltip.summary": "A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom. Results have to be extracted from the component.",
"block.create.millstone.tooltip.condition1": "When Rotated", "block.create.millstone.tooltip.condition1": "When Rotated",
"block.create.millstone.tooltip.behaviour1": "Starts applying _milling_ _recipes_ to any items inserted from the side or the top of the block.", "block.create.millstone.tooltip.behaviour1": "Starts applying _milling_ _recipes_ to any items inserted from the side or the top of the block.",
"block.create.millstone.tooltip.condition2": "When R-Clicked",
"block.create.millstone.tooltip.behaviour2": "Collects the outputs manually.",
"block.create.crushing_wheel.tooltip": "CRUSHING WHEEL", "block.create.crushing_wheel.tooltip": "CRUSHING WHEEL",
"block.create.crushing_wheel.tooltip.summary": "Large rotatable wheels that _break_ _down_ anything.", "block.create.crushing_wheel.tooltip.summary": "Large rotatable wheels that _break_ _down_ anything.",