mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-14 14:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,210 Commits 31 Branches 14 Tags 106 MiB
7ed2f71a01
Commit Graph

135 Commits

Author SHA1 Message Date
PepperCode1
f12701ccc4 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	build.gradle
	gradle.properties
	src/generated/resources/.cache/cache
	src/generated/resources/data/create/tags/blocks/fan_transparent.json
	src/generated/resources/data/create/tags/blocks/tree_attachments.json
	src/generated/resources/data/create/tags/blocks/windowable.json
	src/generated/resources/data/forge/tags/items/beacon_payment.json
	src/main/java/com/simibubi/create/AllFluids.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java
	src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java
	src/main/java/com/simibubi/create/foundation/block/render/DestroyProgressRenderingHandler.java
	src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
	src/main/java/com/simibubi/create/foundation/mixin/DestroyProgressMixin.java
	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
	src/main/resources/META-INF/mods.toml
	src/main/resources/create.mixins.json
 2022-11-22 20:25:55 -08:00
PepperCode1
131c9a5479 Hard-working Registrate 
- Deprecate CreateRegistrate#lazy, add CreateRegistrate#create, and call
registerEventListeners manually
- Remove Create#registrate and use Create.REGISTRATE instead
- Move tag datagen code and methods to TagGen
- Pass event busses directly to Curios#init
- Update logging to use SLF4J
- Update Flywheel to 0.6.8-95
- Increment version to 0.5.0.g
 2022-11-17 13:50:15 -08:00
PepperCode1
80ae80b39b Mixing up the mud 
- Add mixing recipe for mud
- Add BlockTagIngredient
- Update Flywheel
- Bump version
 2022-09-28 22:16:18 -07:00
PepperCode1
97906cb4cc Fix Flywheel JiJ version range 2022-09-25 12:34:18 -07:00
PepperCode1
62f7364b06 Fix build and JiJ Flywheel 
- JiJ Flywheel since Forge 1.19 fixed mixin JiJ
- Add JEI common API as compile time dependency
 2022-08-18 09:27:06 -07:00
PepperCode1
f7280b799c 1.19.2 and improvements 
- Update to 1.19.2
- SuperByteBuffer no longer accepts a null RenderedBuffer
- Add datagen code for BiomeModifiers
- Switch back to Parchment mappings
 2022-08-13 23:42:34 -07:00
PepperCode1
69b4973cac Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
 2022-08-13 21:10:01 -07:00
simibubi
a1b949c084 Graddle me this 
- Temporarily regress to FG 5.1.53
 2022-08-13 18:13:20 +02:00
PepperCode1
5e3f1eff1c Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.19/dev 
Conflicts:
	src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java
 2022-08-07 12:20:18 -07:00
PepperCode1
6c0af5f83f Fix fluid pipe culling 
- Rework PipeAttachmentModel to not rely on cullfaces for extra
information
- Split connector away from rim/drain models into separate models
- Remove none pipe models
 2022-08-06 19:37:19 -07:00
PepperCode1
4b3a972b9b Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/CreateClient.java
	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
	src/main/java/com/simibubi/create/compat/jei/category/SequencedAssemblyCategory.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerApplicationRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/components/steam/whistle/WhistleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueSelectionHandler.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FillingRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/tank/BoilerData.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
	src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipe.java
	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java
	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltSlicer.java
	src/main/java/com/simibubi/create/content/curiosities/armor/BackTankUtil.java
	src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankArmorLayer.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperScreen.java
	src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/AccumulatedItemCountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/BoilerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/DisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/EnchantPowerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidAmountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/FluidListDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemCountDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ItemThoughputDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/KineticSpeedDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/NumericSingleLineDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/PercentOrProgressBarDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/RedstonePowerDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ScoreboardDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/SingleLineDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/StationSummaryDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/StopWatchDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/TimeOfDayDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/display/source/ValueListDisplaySource.java
	src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerClientHandler.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterContainer.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreen.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java
	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java
	src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java
	src/main/java/com/simibubi/create/content/logistics/trains/entity/TrainStatus.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationMarker.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/TrainEditPacket.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/IScheduleInput.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItem.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleScreen.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/CargoThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/FluidThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/ItemThresholdCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/PlayerPassengerCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/RedstoneLinkCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimeOfDayCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/condition/TimedWaitCondition.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeTitleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/DestinationInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/TextScheduleInstruction.java
	src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java
	src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java
	src/main/java/com/simibubi/create/content/schematics/MaterialChecklist.java
	src/main/java/com/simibubi/create/content/schematics/ServerSchematicLoader.java
	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java
	src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
	src/main/java/com/simibubi/create/content/schematics/client/ToolSelectionScreen.java
	src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java
	src/main/java/com/simibubi/create/events/ClientEvents.java
	src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java
	src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java
	src/main/java/com/simibubi/create/foundation/command/CloneCommand.java
	src/main/java/com/simibubi/create/foundation/command/ConfigCommand.java
	src/main/java/com/simibubi/create/foundation/command/CouplingCommand.java
	src/main/java/com/simibubi/create/foundation/command/DumpRailwaysCommand.java
	src/main/java/com/simibubi/create/foundation/command/FixLightingCommand.java
	src/main/java/com/simibubi/create/foundation/command/FlySpeedCommand.java
	src/main/java/com/simibubi/create/foundation/command/HighlightCommand.java
	src/main/java/com/simibubi/create/foundation/command/KillTrainCommand.java
	src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
	src/main/java/com/simibubi/create/foundation/command/ReplaceInCommandBlocksCommand.java
	src/main/java/com/simibubi/create/foundation/command/SConfigureConfigPacket.java
	src/main/java/com/simibubi/create/foundation/config/ui/BaseConfigScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/ConfigModListScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/ConfigScreenList.java
	src/main/java/com/simibubi/create/foundation/config/ui/HintableTextFieldWidget.java
	src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java
	src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java
	src/main/java/com/simibubi/create/foundation/config/ui/entries/NumberEntry.java
	src/main/java/com/simibubi/create/foundation/config/ui/entries/ValueEntry.java
	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
	src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java
	src/main/java/com/simibubi/create/foundation/gui/ModularGuiLineBuilder.java
	src/main/java/com/simibubi/create/foundation/gui/element/TextStencilElement.java
	src/main/java/com/simibubi/create/foundation/gui/widget/AbstractSimiWidget.java
	src/main/java/com/simibubi/create/foundation/gui/widget/Label.java
	src/main/java/com/simibubi/create/foundation/gui/widget/ScrollInput.java
	src/main/java/com/simibubi/create/foundation/gui/widget/SelectionScrollInput.java
	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
	src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
	src/main/java/com/simibubi/create/foundation/ponder/PonderTooltipHandler.java
	src/main/java/com/simibubi/create/foundation/ponder/content/DisplayScenes.java
	src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java
	src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java
	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderTagIndexScreen.java
	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java
	src/main/java/com/simibubi/create/foundation/utility/Debug.java
	src/main/java/com/simibubi/create/foundation/utility/DynamicComponent.java
	src/main/java/com/simibubi/create/foundation/utility/FluidFormatter.java
	src/main/java/com/simibubi/create/foundation/utility/Lang.java
	src/main/java/com/simibubi/create/foundation/utility/LangBuilder.java
 2022-08-03 12:40:21 -07:00
PepperCode1
d9c6418fbf Transforming the bugs away 
- Fix arm interaction point client-side deserialization and
initialization issues
- Fix sequenced gearshift structure rotation
- Fix encased cogwheel rotation, mirroring, and structure transformation
- Add ITransformableBlock to allow custom handling of
StructureTransforms
- Remove DirectionHelper
- Add jarJarRelease Gradle task for building a jarJar without a
classifier
 2022-08-01 01:03:03 -07:00
PepperCode1
233d9b292e Version Conversion: 1.19 edition 
- Mostly port to 1.19
- Remaining errors include:
  - Fluids
  - Features
  - Registry-related code
  - Fake worlds
  - Some datagen code
 2022-07-25 23:33:10 -07:00
PepperCode1
82be76d893 JEI building, Gradle building 
- Refactor JEI category building
- Fix placard item requirement not checking NBT
- Use AddPackFindersEvent instead of ShippedResourcePacks
- Remove unused config values
- Provide separate resource and data formats in pack.mcmeta
- Compress all images
- Update to latest Flywheel
- Disable jarJar inclusion of Flywheel
- Use ${file.jarVersion} instead of ${version}
- Add workaround for SpongePowered/MixinGradle#38
 2022-07-16 01:58:43 -07:00
PepperCode1
4c45333687 JarJar Artifact Jar 
- Use JarJar
  - Include Flywheel automatically
  - Include Registrate instead of shading it
- Refactor Maven coordinate scheme
  - Artifact ID: "Create" -> "create-{minecraft_version}"
  - Artifact Version: "{mod_version}.{patch}-{build_number}"
- Exclude datagen cache from built jars
- Include LICENSE file in build jars
- Sync mods.toml version with gradle.properties version
- Use more modern publication code
- Update Gradle: 7.4.1 -> 7.4.2
 2022-07-14 15:02:24 -07:00
patryk3211
5a747ce93c Added support for wearing goggles on curios head slot 2022-05-10 14:51:38 +02:00
PepperCode1
b32c83e74d Tagging along 
- Fix glowing shader for 1.18.2
- Optimize and compress tag code
- Convert MovementBehaviour to interface
- Remove manual refmap remapping as it is no longer necessary
- Update Gradle
 2022-03-23 01:48:53 -07:00
PepperCode1
3c71e8041b Remove unnecessary code 
- Remove block vertex color code
- Remove experimentalRendering config
- Move as much Item.Properties configuration to AllItems as possible
 2022-02-06 12:22:43 -08:00
Jozufozu
746d9867db Client only flywheel 
- Mark off everything using PartialModel or ContraptionLighter as client-only
 - Likely needs more testing
 2022-01-24 13:41:34 -08:00
Jozufozu
d98a07736c No more diffuse divide 
- Move PlacementSimulationWorld to Flywheel as VirtualRenderWorld
 - Simplify ModelTransformer
 - Model doesn't need #configure
 - Bump Flywheel build
 2021-12-25 15:56:15 -08:00
Jozufozu
ac3c9aa3bb Switch back to parchment, update forge 2021-12-23 23:09:51 -08:00
Jozufozu
6887031ca4 Update forge - 39.0.5 2021-12-15 15:08:07 -08:00
PepperBell
080b048b2f SmarterTileEntity 
- Clean up SyncedTileEntity and SmartTileEntity
- Allow schematicannons to be rotated based on placement angle
- Fix DirectionalExtenderScrollOptionSlot rotation
- Remove deprecated usage of JsonReader and LazyLoadedValue
- Move ToolSelectionScreen to content.schematics.client
- Organize imports
- Update to 1.18.1
 2021-12-10 16:58:05 -08:00
simibubi
061b85d515 New version who dis? 
- Port to 1.18
- ChunkUtil discontinued
- SmartTileEntities write to metadata
- Features generate from -64 up
- World Wrappers weren't convoluted enough
- Haunted bell considers >0 safe
- Missing GuiUtils methods continued in RemovedGuiUtils
 2021-12-07 18:24:57 +01:00
simibubi
e1d8415b09 Add Java version to build logs 2021-12-03 04:29:12 +01:00
Jozufozu
2bde87af33 haunted gradle 
- Update forge
 - Add Flywheel to the runs when using Create/Flywheel gradle workspace
 - Fix weird intellij issues with mixin's annotation processor
 2021-12-02 14:02:00 -08:00
PepperBell
1fdf1ff7e9 Destroyed and deprecated 
- Fix rotation indicator particles
- Fix sail dyeing
- Turn BreakProgressHook into DestroyProgressRenderingHandler interface
- Refactor overlay rendering to properly use API
- Change SpriteShiftEntry to use StitchedSprites
- Use OnDatapackSyncEvent instead of mixin
- Organize foundation.ponder package
- Remove usage of deprecated:
-   Durability bar methods
-   Constants class
 2021-11-27 14:49:43 -08:00
Jozufozu
7a4ed99fb5 Bump flywheel build 
- New project slug
 - StitchedSprite changes
 2021-11-27 12:46:01 -08:00
Jozufozu
3aeef5d0ff The sounds of sand 2021-11-17 19:42:34 -08:00
PepperBell
e0b496f807 Chipped away 2021-11-06 20:59:58 -07:00
PepperBell
3611068e00 Switch to Parchment mappings 2021-11-02 19:30:02 -07:00
PepperBell
0cb7a0260e Chipping away 2021-11-01 22:18:30 -07:00
simibubi
741fa401d8 Move to official class names 
- also updated buildscript to 1.17
- some remap corruption from compilation errors in flw/next
 2021-11-02 00:08:20 +01:00
simibubi
925c98792f (Sp)out of order 
- Added behavioural registry for Spout/Block interaction
- Fixed and Refactored TiCon Casting via Spout
- Fixed fluid pipes getting stuck trying to waterlog non-solid blocks with fluid handling capabilities
- Fixed modlist lookup for non-english locales
 2021-08-25 13:46:53 +02:00
Jozufozu
0349d57929 Fix CI 
- Javadoc doesn't like angle brackets
 - Add jar to artifacts
 2021-08-06 12:13:51 -07:00
Jozufozu
e7c7669d7f Setup build script for maven 2021-08-05 15:09:00 -07:00
simibubi
05d581c779 Blinding transparency 
- Fixed goggle overlay fading into a solid colour when its custom alpha is 0
- Fixed crash rendering saws, addresses #2064
 2021-07-31 12:24:28 +02:00
grimmauld
5610f63375 no more outdated gradle 2021-07-15 11:53:08 +02:00
grimmauld
a048285699 Bulk remap, compiles 2021-07-15 11:32:03 +02:00
grimmauld
f4d73118b1 merge more of the new stuff 2021-07-06 10:05:26 +02:00
grimmauld
f4b16852af Merge all the new stuff 2021-06-26 19:24:59 +02:00
grimmauld
9763631984 Fix up the dynamic trees 2021-06-26 19:13:44 +02:00
PepperBell
c9f9be73ff Buildscript tweaks 
- Move Flywheel version to gradle.properties
- Use implementation instead of compile
 2021-06-23 12:30:10 -07:00
JozsefA
c9d95e83ae Bump flywheel build 2021-06-23 09:13:31 -07:00
JozsefA
dd63c6c4e3 Cleanup and get ready to merge 2021-06-22 21:09:32 -07:00
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
JozsefA
652111c233 Yeet 2021-06-19 00:29:18 -07:00
PepperBell
1e41a390e4 Update buildscript 
- Update Gradle from 5.6.3 to 5.6.4
- Move some versions to gradle.properties
- Switch to new Forge Maven URL
- Update JEI to 1.16.5 and Mixin processor to 0.8.2
- Add out/ to .gitignore
 2021-06-17 22:04:21 -07:00
PepperBell
9235aa93ba JEI Fixes 
- Fix #1661: blasting-only recipes would not be shown under the bulk blasting category
- Add ability to remove matching recipes by type while using the category builder
- Fix fan catalyst items being italicized
- Add and tweak some visibility modifiers
 2021-05-28 23:10:12 -07:00
grimmauld
7ae89ef4e3 Dynamic trees compat (WIP) 2021-05-20 08:31:35 +02:00