JozsefA aeff644cc3 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector ... # Conflicts: # src/generated/resources/assets/create/lang/en_us.json # src/generated/resources/assets/create/lang/unfinished/de_de.json # src/generated/resources/assets/create/lang/unfinished/es_es.json # src/generated/resources/assets/create/lang/unfinished/es_mx.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/pl_pl.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/generated/resources/assets/create/lang/unfinished/zh_tw.json # src/main/java/com/simibubi/create/AllContainerTypes.java # src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java # src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java # src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java # src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java # src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java # src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java # src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java # src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java # src/main/java/com/simibubi/create/content/logistics/item/filter/FilterContainer.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java # src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java # src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java # src/main/java/com/simibubi/create/foundation/gui/mainMenu/CreateMainMenuScreen.java # src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java # src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java # src/main/resources/META-INF/mods.toml # src/main/resources/assets/create/lang/default/messages.json # src/main/resources/assets/create/lang/default/tooltips.json		2021-06-19 16:11:18 -07:00
..
animation	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
ghost	Only a few moves left	2021-05-11 11:02:43 -07:00
outliner	Only a few moves left	2021-05-11 11:02:43 -07:00
placement	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-01 11:47:15 -07:00
recipe	Remove ISimpleReloadListener lambda types	2021-04-28 21:25:06 -07:00
worldWrappers	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
AbstractBlockBreakQueue.java	Housekeeping	2021-04-08 19:22:11 +02:00
AngleHelper.java	Fix super glue rendering	2021-05-06 14:10:12 -07:00
AnimationTickHolder.java	Merge branch 'mc1.16/config-ui' into mc1.16/dev	2021-05-03 16:54:32 +02:00
BlockFace.java	Housekeeping	2021-04-08 19:22:11 +02:00
BlockHelper.java	Allow Schematicannon to defer blocks to print at end	2021-05-21 16:57:01 -04:00
ColorHandlers.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
ColorHelper.java	more changes to color and theme	2021-05-03 16:14:58 +02:00
Couple.java	Housekeeping	2021-04-08 19:22:11 +02:00
Debug.java	Housekeeping	2021-04-08 19:22:11 +02:00
DirectionHelper.java	Housekeeping	2021-04-08 19:22:11 +02:00
DyeHelper.java	Port recent changes to compile	2020-10-04 01:59:51 +02:00
EmptyNamedTag.java	Housekeeping	2021-04-08 19:22:11 +02:00
FilesHelper.java	Init Cleanup	2021-05-22 18:00:10 -07:00
FontHelper.java	Housekeeping	2021-04-08 19:22:11 +02:00
ICoordinate.java	Init Cleanup	2021-05-22 18:00:10 -07:00
IntAttached.java	Faith in your Depot	2021-03-26 00:15:38 +01:00
IPartialSafeNBT.java	Better support for partially safe NBT writing	2021-05-21 20:33:28 -04:00
ISimpleReloadListener.java	Add ISimpleReloadListener	2021-04-28 13:37:21 -07:00
Iterate.java	Housekeeping	2021-04-08 19:22:11 +02:00
Lang.java	Merge branch 'mc1.15/dev' into mc1.16/dev	2021-03-20 12:58:02 +01:00
MatrixStacker.java	Housekeeping	2021-04-08 19:22:11 +02:00
NBTHelper.java	Housekeeping	2021-04-08 19:22:11 +02:00
NBTProcessors.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
Pair.java	Random stuff	2021-04-29 11:44:45 -07:00
Pointing.java	Prospective 1.16 port start - only find/replace fixes so far	2020-07-22 22:16:11 -04:00
RaycastHelper.java	Housekeeping	2021-04-08 19:22:11 +02:00
RemapHelper.java	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-05-25 12:23:55 -07:00
ServerSpeedProvider.java	Housekeeping	2021-04-08 19:22:11 +02:00
TreeCutter.java	Housekeeping	2021-04-08 19:22:11 +02:00
UniqueLinkedList.java	Housekeeping	2021-04-08 19:22:11 +02:00
VecHelper.java	Fix JEI Scene Lighting	2021-05-06 14:14:31 -07:00
VoxelShaper.java	Housekeeping	2021-04-08 19:22:11 +02:00
WorldAttached.java	Only a few moves left	2021-05-11 11:02:43 -07:00
WorldHelper.java	Housekeeping	2021-04-08 19:22:11 +02:00