backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-29 21:03:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4jcraft/Minecraft.World/Recipes
History
MatthewBeshay a0fdc643d1 Merge branch 'upstream-dev' into cleanup/nullptr-replacement 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
2026-03-30 16:28:40 +11:00
..
ArmorDyeRecipe.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ArmorDyeRecipe.h build fixes 2026-03-21 19:19:31 -05:00
ArmorRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
ArmorRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ClothDyeRecipes.cpp cleanup: flatten dead branches in world io level network and stats 2026-03-26 20:53:52 +11:00
ClothDyeRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FireworksRecipe.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
FireworksRecipe.h chore: fmt 2026-03-25 16:08:00 -05:00
FoodRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
FoodRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
FurnaceRecipes.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
FurnaceRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
MapCloningRecipe.h TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
MapExtendingRecipe.h TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
OreRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
OreRecipes.h TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
Recipes.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
Recipes.h refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
Recipy.h more build fixes 2026-03-22 01:14:52 -05:00
ShapedRecipy.cpp refactor: replace NULL with nullptr across C++ codebase 2026-03-30 16:25:52 +11:00
ShapedRecipy.h build fixes 2026-03-21 19:19:31 -05:00
ShapelessRecipy.cpp Merge branch 'upstream-dev' into cleanup/nullptr-replacement 2026-03-30 16:28:40 +11:00
ShapelessRecipy.h build fixes 2026-03-21 19:19:31 -05:00
StructureRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
StructureRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
ToolRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
ToolRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00
WeaponRecipes.cpp TU19: merge Minecraft.World/Recipes 2026-03-21 17:27:44 -05:00
WeaponRecipes.h chore: format Minecraft.World 2026-03-13 17:06:56 -05:00