mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-09 13:56:26 +01:00
Code Issues Projects Releases Packages Wiki Activity
3095 commits 31 branches 14 tags 107 MiB
Commit graph

1268 commits

Author SHA1 Message Date
PepperCode1
97906cb4cc Fix Flywheel JiJ version range 2022-09-25 12:34:18 -07:00
PepperCode1
92d05e7498 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
 2022-09-25 12:26:52 -07:00
luffypirat
94578adad5
Updates to ru_ru.json by luffypirat (#3817) 2022-09-25 20:48:28 +02:00
璀境石
916638997d
Updates to zh_cn.json by Demonese (#3814) 2022-09-25 20:47:52 +02:00
simibubi
2d31364eef Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-23 20:54:40 +02:00
simibubi
4d4a959cfa Mixing up a Storm 
- Reduced tps impact of basin recipe lookups noticeable in larger modpacks
- Fixed Brass tunnels distributing back into the side items get inserted from
- Fixed Brass tunnels distributing into sides blocked by an inserting funnel
- Cargo Conditions in schedules now match any cargo if no filter is specified
 2022-09-23 18:40:15 +02:00
PepperCode1
09124ea92b Add config for automated brewing 
- Add allowBrewingInMixer config
- Add 0.5.0e to the bug report template
- Allow Flywheel 0.6.6
 2022-09-22 12:09:23 -07:00
simibubi
d6ca0343b8 PR Datagen 
- Hand cranks, valve handles and smart pipes can now be waterlogged
- Version bumped
 2022-09-22 20:10:42 +02:00
Andre_601
143b26cab7
Updates to de_de.json by Andre601 (#3777) 2022-09-22 18:43:44 +02:00
435THz
6338d28feb
Updates to it_it.json by 435THz (#3775) 2022-09-22 18:31:49 +02:00
simibubi
01a788b4f7 Update pl_pl.json 2022-09-22 18:26:15 +02:00
simibubi
a9faf4796f
Merge pull request #3739 from MarioSMB/mc1.18/dev 
Add some compatibility recipes for Oh The Biomes You'll Go and Farmer's Delight
 2022-09-22 18:21:37 +02:00
luffypirat
46e48b77a4
Updates to ru_ru.json by luffypirat (#3648) 2022-09-22 18:17:01 +02:00
simibubi
34c9ae4a47 Merge branch 'mc1.18/dev' into mc1.19/dev 2022-09-17 21:49:56 +02:00
simibubi
aeee9f8793 Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2022-09-10 14:04:14 +02:00
simibubi
b5fce16f0b Oops, no applied 
- Update ae2 compat recipes
 2022-09-10 14:01:28 +02:00
PepperCode1
dfe13d4ad7 One mechanical arm's trash is another mechanical arm's treasure 
- Fix arms not being able to place more than one item into a composter
- Add COMPOSTABLE item attribute
- Tweak BLASTABLE attribute's descriptions
 2022-09-07 18:34:43 -07:00
Mario
961d218fc2 Add a crushing recipe for BYG ametrine ore 2022-09-03 13:27:53 +10:00
Mario
f82ae785ef Add a compatibility recipe for haunting Farmer's Delight tomatoes 2022-09-03 12:53:07 +10:00
Mario
2adad077a9 Add some compatibility recipes for Oh The Biomes You'll Go 2022-09-03 12:43:14 +10: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
65073e84bd Patch D 2022-08-13 23:19:44 +02:00
simibubi
b8884fabad PR Datagen 2022-08-13 14:52:53 +02:00
andersonwu2000
54a2ad801a
Updates to zh_tw.json by andersonwu2000 and Akagiyoukai (#3580) 2022-08-13 14:45:01 +02:00
CKenJa
3aec03f5c6
Updates to ja_jp.json by CKenJa (#3573) 2022-08-13 14:41:16 +02:00
Borusu1
a1431c0995
Added uk_ua.json by Borusu1 (#3570) 2022-08-13 14:38:18 +02:00
璀境石
67fa323637
Updates to zh_cn.json by Demonese (#3557) 2022-08-13 14:35:23 +02:00
luffypirat
693e2f6730
Updates to ru_ru.json by luffypirat (#3556) 2022-08-13 14:33:54 +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
simibubi
a9b61b5c2f Chipping away 2022-08-04 12:56:08 +02: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
simibubi
999703c88b Tweaks to the deployer tooltip 2022-08-01 17:16:39 +02:00
simibubi
47902e77c0 PR Datagen 2022-08-01 16:47:28 +02:00
simibubi
3a98396a12 Squashed commit of the following: 
commit a931c8900f
Author: 435THz <pil8andrea@gmail.com>
Date:   Thu Jul 28 01:32:13 2022 +0200

    forgot to change file on main

commit f7e4a56aae
Author: 435THz <pil8andrea@gmail.com>
Date:   Wed Jul 27 15:06:49 2022 +0200

    previously added 2 lines for no reason. removed them here

commit daa8e428ba
Author: 435THz <pil8andrea@gmail.com>
Date:   Wed Jul 27 14:56:53 2022 +0200

    finally done

commit 8008de2489
Author: 435THz <pil8andrea@gmail.com>
Date:   Wed Jul 27 14:49:37 2022 +0200

    done

commit d0eb27142c
Author: 435THz <pil8andrea@gmail.com>
Date:   Tue Jul 26 21:12:47 2022 +0200

    done

commit 6c3254f9a7
Author: 435THz <pil8andrea@gmail.com>
Date:   Wed Jul 20 02:36:49 2022 +0200

    down to 666

commit 0939d9e2f1
Author: 435THz <pil8andrea@gmail.com>
Date:   Mon Jul 18 18:45:07 2022 +0200

    hoping to not break anything
 2022-08-01 16:06:16 +02:00
simibubi
ac1609ba5a Squashed commit of the following: 
commit 04496e59b1
Author: LexinonCraft <willi4wuff@gmail.com>
Date:   Tue Jul 26 01:51:48 2022 +0200

    Generated data

commit 261acf4038
Author: LexinonCraft <willi4wuff@gmail.com>
Date:   Tue Jul 26 01:45:34 2022 +0200

    Replaced old lang file with new lang file

commit 69c97b40c7
Author: LexinonCraft <willi4wuff@gmail.com>
Date:   Tue Jul 26 01:44:06 2022 +0200

    Finished translations except for descs and ponder

commit 3ef136bd89
Author: LexinonCraft <willi4wuff@gmail.com>
Date:   Mon Jul 25 19:02:07 2022 +0200

    Translated (almost) all blocks to German
 2022-08-01 16:05:24 +02:00
vyhi
700ec95976
Updates to pt_br.json by vyhi (#3329) 2022-08-01 15:55:44 +02:00
muriplz
d1381ad33f
Updates to es_es.json by muriplz (#3313) 2022-08-01 15:54:33 +02:00
luffypirat
ccb4a25c1b
Updates to ru_ru.json by luffypirat (#3281) 2022-08-01 15:50:39 +02:00
qkrehf2
652e226ec0
Updates to ko_kr by qkrehf2 (#3243) 2022-08-01 15:49:45 +02:00
璀境石
4a0ad8807a
Updates to zh_cn.json by Demonese et al. (#3181) 2022-08-01 15:48:37 +02: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
SuperCoder79
64dc6fcabb Improve deployer goggle tooltip 2022-07-19 11:03:28 -04: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
simibubi
1ec63c1511 Patch it while its hot 
- Fixed Dedicated server crash when riding a train
- Fixed broken localisation component in super glue editor
- Fixed display links not showing correct icons for dyed nixie tubes
 2022-07-12 17:51:25 +02:00
simibubi
370414846d bumb 2022-07-12 03:15:12 +02:00
PepperCode1
2508d1da25 Button split 
- Replace project page button with separate CurseForge and Modrinth
buttons
- Add null check to mc.gameMode in ToolboxHandlerClient.onKeyInput
 2022-07-11 14:08:44 -07:00
luffypirat
a5903c11d6
Updates to ru_ru.json by luffypirat (#3244) 2022-07-11 22:34:43 +02:00