tterrag 696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/generated/resources/.cache/cache # src/generated/resources/assets/create/lang/unfinished/de_de.json # src/generated/resources/assets/create/lang/unfinished/fr_fr.json # src/generated/resources/assets/create/lang/unfinished/it_it.json # src/generated/resources/assets/create/lang/unfinished/ja_jp.json # src/generated/resources/assets/create/lang/unfinished/ko_kr.json # src/generated/resources/assets/create/lang/unfinished/nl_nl.json # src/generated/resources/assets/create/lang/unfinished/pt_br.json # src/generated/resources/assets/create/lang/unfinished/ru_ru.json # src/generated/resources/assets/create/lang/unfinished/zh_cn.json # src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java # src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java # src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java # src/main/java/com/simibubi/create/foundation/item/ItemDescription.java		2020-11-28 17:24:30 -05:00
..
outliner	Port recent changes to compile	2020-10-04 01:59:51 +02:00
recipe	ProcessingRecipe Refactor	2020-09-04 01:23:09 +02:00
worldWrappers	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-11-26 00:57:29 +01:00
AngleHelper.java	Fundamentals of Fluid Transfer	2020-08-24 21:02:03 +02:00
AnimationTickHolder.java	Better Goggles and Rpm	2020-02-01 09:39:17 +01:00
BlockFace.java	Fundamentals of Fluid Transfer	2020-08-24 21:02:03 +02:00
BlockHelper.java	porty porty all the PRs	2020-11-15 10:41:05 +01:00
ColorHelper.java	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev	2020-09-20 00:37:27 -04:00
Couple.java	Spinny vortex	2020-11-06 19:45:38 +01:00
Debug.java	Fix some more text components	2020-10-06 12:21:13 +02:00
DirectionHelper.java	Valves and Valve handles	2020-09-25 17:22:16 +02:00
DyeHelper.java	Port recent changes to compile	2020-10-04 01:59:51 +02:00
EmptyNamedTag.java	Clean-up Crew	2020-10-30 12:18:21 +01:00
FilesHelper.java	fixed client to-desktop crash with ":" in schematic name	2020-09-05 21:30:36 +02:00
IntAttached.java	Spinny vortex	2020-11-06 19:45:38 +01:00
Iterate.java	Pole Vault	2020-11-22 14:27:50 +01:00
Lang.java	even more porty?	2020-09-22 22:00:44 +02:00
LerpedFloat.java	Fundamentals of Fluid Transfer	2020-08-24 21:02:03 +02:00
MatrixStacker.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-11-20 17:50:04 +01:00
NBTHelper.java	Port Changes to 1.16, Fix server launch	2020-10-12 22:16:06 +02:00
Pair.java	Couple things, Part I	2020-08-05 22:10:05 +02:00
Pointing.java	Prospective 1.16 port start - only find/replace fixes so far	2020-07-22 22:16:11 -04:00
RaycastHelper.java	Do some porty stuff	2020-09-22 17:44:22 +02:00
RemapHelper.java	Loading 1.14 worlds? Yes please.	2020-11-14 12:15:38 +01:00
ServerSpeedProvider.java	Couple things, Part I	2020-08-05 22:10:05 +02:00
ShadowRenderHelper.java	Port recent changes to compile	2020-10-04 01:59:51 +02:00
SuperByteBuffer.java	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev	2020-11-28 17:24:30 -05:00
SuperByteBufferCache.java	Brackets and spilled potions	2020-11-04 19:08:01 +01:00
TileEntityRenderHelper.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2020-11-26 00:57:29 +01:00
TreeCutter.java	Clean-up Crew	2020-10-30 12:18:21 +01:00
VecHelper.java	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev	2020-09-20 00:37:27 -04:00
VirtualEmptyModelData.java	Brackets and spilled potions	2020-11-04 19:08:01 +01:00
VoxelShaper.java	Port recent changes to compile	2020-10-04 01:59:51 +02:00
WorldAttached.java	Couple things, Part I	2020-08-05 22:10:05 +02:00
WorldHelper.java	Below 3 digit compile errors, finally	2020-09-23 21:42:31 +02:00