Spoilage

.github/pull_request_template.md

@@ -9,9 +9,6 @@ _Any implementations in this PR that should be carefully looked over, or that co
 _A short description of what this PR added/fixed/changed/removed._
 _For correct linking of issues please use any of the Closes/Fixes/Resolves keywords. Example: When a PR is fixing a bug use "Fixes: #number-of-bug"_
 
-## How Was This Tested
-_This section is for screenshots, code snippets or descriptions of how the PR was tested in code or in game to ensure correctness._
-
 ## Additional Information
 _This section is for screenshots to demonstrate any GUI or rendering changes, or any other additional information that reviewers should be aware of._
 

CHANGELOG.md

@@ -1,73 +1,5 @@
 # ChangeLog
 
-## Version [v7.5.2](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.5.1-1.20.1...v7.5.2-1.20.1)
-### Fixed
-
-- Turn groupColor field value into optional field codec by @jurrejelle in [#4593](https://github.com/GregTechCEu/GregTech-Modern/pull/4593)
-- Fix wrong argument check for 'redstone set #' placeholder by @FyreDrakon in [#4595](https://github.com/GregTechCEu/GregTech-Modern/pull/4595)
-- Fix ore vein consistency by sorting the cache by @jurrejelle in [#4602](https://github.com/GregTechCEu/GregTech-Modern/pull/4602)
-- Fix CR being displayed on CM when pasting text on windows by @TarLaboratories in [#4603](https://github.com/GregTechCEu/GregTech-Modern/pull/4603)
-
-
-## Version [v7.5.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.5.0-1.20.1...v7.5.1-1.20.1)
-### Fixed
-
-- Fix access protection issue in netherite tools + lamprenderer issues by @jurrejelle in [#4579](https://github.com/GregTechCEu/GregTech-Modern/pull/4579)
-
-
-## Version [v7.5.0](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.4.1-1.20.1...v7.5.0-1.20.1)
-### Added
-
-- 7.4.x Haze small fusion ctm tweaks bc it was bothering me by @HazeVista in [#4432](https://github.com/GregTechCEu/GregTech-Modern/pull/4432)
-- Add option to display temperatures in Celsius by @TarLaboratories in [#3839](https://github.com/GregTechCEu/GregTech-Modern/pull/3839)
-- Spray cans with AE2 IColorableBlockEntity support by @zetrock1 in [#4264](https://github.com/GregTechCEu/GregTech-Modern/pull/4264)
-- Rework machine copy/paste card to support copying pipes, covers, cover settings, and more machine settings by @gustovafing in [#4272](https://github.com/GregTechCEu/GregTech-Modern/pull/4272)
-- Add Hotkey for StepAssist by @zetrock1 in [#4291](https://github.com/GregTechCEu/GregTech-Modern/pull/4291)
-- Add HV, IV screwdriver and chainsaw by @zetrock1 in [#4310](https://github.com/GregTechCEu/GregTech-Modern/pull/4310)
-- Jade battery provider by @zetrock1 in [#4317](https://github.com/GregTechCEu/GregTech-Modern/pull/4317)
-- Add CC: Tweaked peripheral for ghost programmed circuit by @blockninja124 in [#4468](https://github.com/GregTechCEu/GregTech-Modern/pull/4468)
-- Trinium spring by @zetrock1 in [#4470](https://github.com/GregTechCEu/GregTech-Modern/pull/4470)
-- Output bus filtering by @zetrock1 in [#4337](https://github.com/GregTechCEu/GregTech-Modern/pull/4337)
-- Allow rendering other modules from placeholders by @TarLaboratories in [#3900](https://github.com/GregTechCEu/GregTech-Modern/pull/3900)
-- Add gem slurry from purified ore recipes by @SpicyNoodle5 in [#4413](https://github.com/GregTechCEu/GregTech-Modern/pull/4413)
-- Recipe Fail Reason Display by @illuciaz23 in [#4487](https://github.com/GregTechCEu/GregTech-Modern/pull/4487)
-- Add biomeTag recipe condition by @chloecat34 in [#4419](https://github.com/GregTechCEu/GregTech-Modern/pull/4419)
-
-### Fixed
-
-- Fix overwriting FOV when on concrete by @zetrock1 in [#4446](https://github.com/GregTechCEu/GregTech-Modern/pull/4446)
-- Stop placeholder execution when an exception is encountered by @TarLaboratories in [#4455](https://github.com/GregTechCEu/GregTech-Modern/pull/4455)
-- Fix tank valve info by @zetrock1 in [#4454](https://github.com/GregTechCEu/GregTech-Modern/pull/4454)
-- Fix voltage display by @illuciaz23 in [#4462](https://github.com/GregTechCEu/GregTech-Modern/pull/4462)
-- Fixed Multi Smelter texture again. by @Conity723 in [#4469](https://github.com/GregTechCEu/GregTech-Modern/pull/4469)
-- Terminal tooltip change to ensure consistent terminology  by @HazeVista in [#4458](https://github.com/GregTechCEu/GregTech-Modern/pull/4458)
-- Only allow http and https by @TarLaboratories in [#4457](https://github.com/GregTechCEu/GregTech-Modern/pull/4457)
-- Add check to not cache invalid recipes by @jurrejelle in [#4486](https://github.com/GregTechCEu/GregTech-Modern/pull/4486)
-- Remove BlockEntity Check in MinerLogic by @lilpaladin1 in [#4488](https://github.com/GregTechCEu/GregTech-Modern/pull/4488)
-- Fix autogenerating mortar recipes by @jurrejelle in [#4498](https://github.com/GregTechCEu/GregTech-Modern/pull/4498)
-- Replace mandatory air with any in blast chiler structure by @jurrejelle in [#4502](https://github.com/GregTechCEu/GregTech-Modern/pull/4502)
-- Fix CME with parts and partpositions when calling getParts in addedToController by @jurrejelle in [#4505](https://github.com/GregTechCEu/GregTech-Modern/pull/4505)
-- Fix missing/invalid pipe model issues by @screret in [#4530](https://github.com/GregTechCEu/GregTech-Modern/pull/4530)
-- Fix bug in NBTPredicateIngredient serializer by @Mqrius in [#4536](https://github.com/GregTechCEu/GregTech-Modern/pull/4536)
-- Fix dust disassembly recipes by @TarLaboratories in [#4456](https://github.com/GregTechCEu/GregTech-Modern/pull/4456)
-- Fix pipes missing break particle textures by @screret in [#4533](https://github.com/GregTechCEu/GregTech-Modern/pull/4533)
-- Simplify material block models and fix issues they had with shaders by @screret in [#4532](https://github.com/GregTechCEu/GregTech-Modern/pull/4532)
-- Fix pipes' block break animation being the wrong shape by @screret in [#4543](https://github.com/GregTechCEu/GregTech-Modern/pull/4543)
-- Fixed tooltip order for Large Assembler by @HazeVista in [#4552](https://github.com/GregTechCEu/GregTech-Modern/pull/4552)
-- Match Painted Output Busses to Painted Input Busses by @DilithiumThoride in [#4273](https://github.com/GregTechCEu/GregTech-Modern/pull/4273)
-- Improve bedrock vein randomness by @Gaider10 in [#4574](https://github.com/GregTechCEu/GregTech-Modern/pull/4574)
-
-### Changed
-
-- Two-Phase Recipe Addition System by @TechLord22 in [#3981](https://github.com/GregTechCEu/GregTech-Modern/pull/3981)
-- Correction and update of the new uk_ua by @MetenBouldry in [#4452](https://github.com/GregTechCEu/GregTech-Modern/pull/4452)
-- Use Generic Builder pattern for MachineBuilder by @jurrejelle in [#4422](https://github.com/GregTechCEu/GregTech-Modern/pull/4422)
-- Distribute display voltage logic to machine implementations by @toapuro in [#4459](https://github.com/GregTechCEu/GregTech-Modern/pull/4459)
-- DFS stack-based recipe lookup implementation by @jurrejelle in [#3986](https://github.com/GregTechCEu/GregTech-Modern/pull/3986)
-- Pipe model rework by @screret in [#4283](https://github.com/GregTechCEu/GregTech-Modern/pull/4283)
-- Remove muffler hatch requirement from Large Distillery by @GirixK in [#4195](https://github.com/GregTechCEu/GregTech-Modern/pull/4195)
-
-
 ## Version [v7.4.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v7.4.0-1.20.1...v7.4.1-1.20.1)
 ### Added
 

docs/content/Development/Data-Sync-System/Migrating-From-LDLib-SyncData.md

@@ -3,56 +3,6 @@ title: "Migrating from LDLib SyncData"
 ---
 # Migrating from LDLib SyncData
 
-### Simple example
-
-This simple example covers the majority of use cases when adding sync/save fields to a standard machine, machine trait or cover.
-
-#### With LDLib:
-```java
-class CustomMachine extends SimpleTieredMachine {
-    protected static final ManagedFieldHolder MANAGED_FIELD_HOLDER = new ManagedFieldHolder(CustomMachine.class,
-            SimpleTieredMachine.MANAGED_FIELD_HOLDER);
-
-    @Override
-    public ManagedFieldHolder getFieldHolder() {
-        return MANAGED_FIELD_HOLDER;
-    }
-
-    @Getter 
-    @Persisted
-    @DescSynced
-    @RequireRerender
-    protected int customIntValue;
-
-    @Persisted(key = "customNBTKey")
-    protected String customStringValue;
-
-    public void setCustomIntValue(int newValue) {
-        this.customIntValue = newValue;
-    }
-}
-```
-
-#### New System:
-```java
-class CustomMachine extends SimpleTieredMachine {
-    @Getter 
-    @SaveField
-    @SyncToClient
-    protected int customIntValue;
-
-    @SaveField(nbtKey = "customNBTKey")
-    protected String customStringValue;
-
-    public void setCustomIntValue(int newValue) {
-        this.customIntValue = newValue;
-        ////// IMPORTANT: markClientSyncFieldDirty must be called to update client synced fields.
-        getSyncDataHolder().markClientSyncFieldDirty("customIntValue");
-    }
-}
-
-```
-
 ### General migration guidelines
 
 - Remove all `ManagedFieldHolder` fields.

docs/content/Gameplay/Logistics/Machines.md

@@ -42,37 +42,6 @@ the power button in its UI or by right-clicking it with a Soft Mallet.
 
 Buses and Hatches can accept automated import or export from other sides, so long as something else is causing it.
 
-### Distinct, Painted, and Filtered Inputs and Outputs
-Under normal circumstances, **all** input Buses and Hatches and on a multiblock machine will be checked for recipe
-inputs, and all output buses and hatches will be used to place recipe outputs. However, this can lead to unwanted behavior
-where a user wants a single machine to do multiple recipes, but the ingredients to those recipes can conflict and be used
-to run an unwanted third recipe. Additionally, when a machine is being used like this, the output bus/hatch to which
-produced items/fluids are delivered is chosen somewhat arbitrarily, making it difficult or unwieldy to plan pipes to carry
-specific output products away.
-
-GTM offers three tools for this problem: Fluid Hatch Filter Locking, Distinct Buses and Painted Buses/Hatches.  
-
-* Fluid Hatch Filter Locking is a simple system for resolving the problem of deciding what output hatches receive what
-produced fluids. Using the same interface as a Super Tank, a Fluid Output Hatch can have its current contained fluid
-Locked, meaning that only that fluid will ever be placed in it; or the Hatch can be pre-emptively locked to a fluid by
-dragging that fluid from JEI/EMI into the Hatch's output slot.
-* Filter Locking only works with standard *single* fluid hatches, and cannot be done to the higher-tier Quadruple or 
-Nonuple Fluid Hatches. (However, those Hatches also cannot contain a single fluid in more than one slot, so they do
-still allow for some degree of output separation when used with Quadruple or Nonuple Fluid Pipes.)
-* Distinct Buses is a toggle used on Input Buses (not Hatches), which causes the machine to look at this bus as being
-separate from all other Distinct Buses. (One distinct bus has no meaning, but two distinct buses on one machine will
-cause the machine to search each distinct bus separately).
-* Painted Buses/Hatches are hatches which have been Painted using a can of spray paint. Input Buses/Hatches which have been
-Painted in the same color are looked at together by the machine searching for recipe inputs, but any items/fluids stored
-in buses/hatches with a different color are not used for the search. The isolation works the same as for Distinct Buses,
-but it allows for multiple buses/hatches to be searched together as a group.
-* Prior to version 7.5.0, painting **Output** Buses/Hatches had no effect. Version 7.5.0 introduced machines pairing their 
-Painted Outputs to their Painted Inputs, such that if a recipe pulls items from a Painted Input, it can only output the 
-products of that recipe to a Painted Output of the same color (or an unpainted output).
-* Buses and Hatches that are not painted, or not set to Distinct, are always fair game for the machine - Distinct and 
-Painted Inputs can always pull from other non-distinct and non-painted inputs; and recipes that used ingredients from 
-Painted Inputs can always send their products to non-painted outputs.
-
 ## Passthrough Hatches and the Cleanroom
 The Cleanroom is a unique multiblock with unique restrictions. Because the Cleanroom must have solid walls, pipes, cables,
 and inventories outside cannot directly connect to machines inside. For this purpose, Passthrough Hatches exist.

docs/content/Modpacks/Changes/v7.4.0.md

@@ -24,3 +24,4 @@ to
 `roll(RecipeCapability<?> cap, List<Content> chancedEntries, ChanceBoostFunction boostFunction, int recipeTier, int chanceTier, Object2IntMap<?> cache, int times)`
 
 (The chance roll function now also requires the RecipeCapability that is currently being processed to be passed in.)
+