| Age | Commit message (Collapse) | Author |
|---|
|
* wrap MTE ids print into a debug option
* remove EnsureToBeLoadedLast config
* exit early
* spotless apply
* making collision checks optional by default
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* round 1
* RS-AL recipes
* round 3 with a bit of cleanup
* round 4
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* Fix laser engraver comparator
* debug: use no custom comparator for laser map (do not merge this commit)
* Revert "debug: use no custom comparator for laser map (do not merge this commit)"
This reverts commit ffc66689f301294f1c4d210a2928ec9a367d4961.
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
* add chest cover
* Spotless apply for branch feature/chestcover for #2593 (#2594)
* create window on the left
* sa
* add slot migration
* add texture and T2&3
* add texture and T2&3
* spotless
* fix bugs
* add chest cover
* small fix and spotless
Co-Authored-By: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Nxer <43300390+Nxer@users.noreply.github.com>
Co-authored-by: Nxer <306803661@qq.com>
|
|
* remove unused config "HardCoreCableLoss"
* remove unused config "DisableIC2Cables"
* remove unused booleans
* Spotless apply for branch sort_recipes for #2897 (#2898)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* remove unused config "NerfCombs"
* remove unused config "NerfCrops"
* remove unused config "ArcSmeltIntoAnnealedWrought"
* remove unused boolean
* remove unused config "online"
* remove unused stuff
* remove unused config "HardMachineCasings"
* remove unused config "NerfDustCrafting"
* exit early
* remove unused config "harderstone"
* decouple recipes from machine registration for
alloy smelter, arc furnace, assembler, autoclave, bending machine, canner, printer, recycler, sifter, slicer, thermal centrifuge, unpackager, wiremill
* decouple recipes from machine registration for
microwave, polarizer,plasma arc furnace, oven, ore washer, mixer, microwave
* decouple recipes from machine registration for
forming press, laser engraver, lathe, macerator, matter amplifier
* decouple recipes from machine registration for
centrifuge, extruder, fermenter, fluid canner, fluid extractor, fluid heater, fluid solidifier, forge hammer
* decouple recipes from machine registration for
chemical bath, chemical reactor, circuit assembler, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator,
extractor
* spotless apply
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* hydrogensulfiderecipe
* fix typo
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* Follow-up for recipe config removal
* Remove duration check
Recipes without recipe config key were not removed in the first place
---------
Co-authored-by: boubou19 <miisterunknown@gmail.com>
|
|
* Remove redundant inputSeparation=true call
* Remove deprecated MetaTileEntity#isDisplaySecondaryDescription
* Always use ModularUI
* Remove useModularUI
* Remove unused GUI features
* Remove IGlobalWirelessEnergy
* Remove CommonValues.V & CommonValues.VN
* More deprecation cleanup
---------
Co-authored-by: boubou19 <miisterunknown@gmail.com>
|
|
* makeshift solution of telling structurelib to not place gt hatches
* Spotless apply for branch feature/gt-no-hatch for #2881 (#2882)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* GT music system
* Minor fix for some glitches when switching dimensions with P2Ps on both sides
* Most features implemented except headphones
* Implement wireless headphones
* Disable debug mode
* Spotless
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* add forbidden getModItem calls
* remove bartworks gmi
* remove goodgenerators gmi
* spotless
* no more literals in getModItem calls
* fix kekztech calls
* fix kubatech calls
* fix gregtech calls (1/?)
* move WA from NHCore to GT5U
* MTE enum expanded with bw values
* MTE enum expanded with tectech values
* fix inversion
* fix gregtech calls (2/?)
* copied enum from NHCore to GT5U and moved machine hulls
* moved plasma gens and alloy smelters
* moved machine matter amplifiers, assemblers, scanners, Pump, transformers
* moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches
* moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches
* moved circuit assemblers
* moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer
* moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine
* moved batteries
* comment
* spotless apply
* yeet * imports
* bronze blast furnace is no more since a while
* sanitize kubatech MTE registration
* merge GG's MTE enum into GT5U one
* fix gregtech calls (3/4)
* fix gt++ calls (1/?)
* small cleanup
* fix gt++ calls (2/3)
* fix gt++ calls (3/3)
* temporary test
* fix config
* Revert "temporary test"
This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724.
* disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts
* spotless apply
* dumb dumb
* fix dynamic access to CustomItemList
* update tests
* fix scala test
* fix script?
* fix script?
* actual fix?
* there we go!
* yeet GT for now, until we move the EOH Controller recipe somewhere else
* fix dep
|
|
* remove dead code
* use proper materials for tiered circuits
* remove yet another RA1 call
* remove deprecated usage
* small step toward Research station assline recipes migration
* remove dead code
* remove dead code
* remove dead code
* migrate BW recipes
* remove some more RA1 code
* remove bad search and replace + spotlessapply
* yeet deprecated code and change how sieverts for recipes are computed
* fix loading
* fix bad replacements
* spotless apply
|
|
Fix fullenergy debug
|
|
* Remove fixEnergyRequirements
* update
* fix
* spotless
|
|
* try to add baryonic matter fluid texture
* fix baryonic matter custom fluid
* adjust purified water names
* do not form waterline multis without positioned hatches to prevent crashes
* final baryonic matter texture
|
|
|
|
* Implement dim num agnostic isGenerationAllowed function
Replaces references to old function in as many places as possible
Only reference that can't be changed right now is `E:\MinecraftProjects\GT5-Unofficial\src\main\java\com\github\bartimaeusnek\crossmod\galacticgreg\VoidMinerUtility.java:189`
* Account for unloaded world or null provider by instead doing a dim number check
This route should be avoided when possible.
* Apply Spotless
|
|
* Faster dev boot times (120s --> 80s while profiling)
* Clean up sloppy hard deps and properly gate them behind isModLoaded() checks.
* Include CoreTweaks as runtime only non publishable for faster boot as well
|
|
Laser Hatches (#2859)
* Remove laser recipes based on tiers
* Add 4M and 16M Laser Hatches
* Add Laser Mirror
* Add Laser Mirror recipe
* Refactor mirror
* Add customizable amperage to laser source hatches
* Hide lasers from NEI, add customizable amperage to target hatches
* Fix missing connection branch
* Address review
|
|
Require 1 fluid input in assline recipes
|
|
Add Et Futurum Requiem to the mods list so we can modify recipes in Core.
|
|
* Removed coolant logic from LHE & XL LHE
* Added LHECoolantRegistry, which replaces the coolant checking logic
|
|
* Add new butane option for Anti-Knock
-> Add new alternative MTBE fluid made from Butane instead of Butene, to prevent mixing the two fluids;
-> Add equivalent recipes for the new fluid, with Butane instead of Butene.
* Spotless apply for branch Butane_For_AntiKnock for #2762 (#2763)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* duct tape fix
(cherry picked from commit 7cfb3923d6ff6abe6d56d6bbab3d05eb5529bb64)
(cherry picked from commit 670b21508b9f429eace6bee29b7426dd30c4dd00)
(cherry picked from commit 881dcefd8d2e6d72d1fa4970ee9704adfbf68c4c)
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dream Master <dream-master@gmx.net>
|
|
* swap circuits in engraving for distilled water
* change quark goop textures and water colors
* add structure tooltip to grade 8 multi
* display quark catalysts in t8 frontend
* add simple uv treatment frontend to show lenses
* add final quark catalyst textures and recipes
* remove electromagnet from recipe
* fix baryonic perfection recipemap and quark colors in scanner output
|
|
* Added the miniature wormhole generator
* Updated structure & tooltip and added hatch hask
* Fixed controller promotion not working
* Initial work wormhole render + spotless + git strangeness
* Fix wildcard imports
* Removed redundant code + added more reasonable defaults
* fix
* sa
* Remove debug print statements
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: CookieBrigade <138534411+cookiebrigade@users.noreply.github.com>
|
|
* Fix solenoid page assignment
* Forgot to declare the page itself
* Accidentally dropped the override tag
|
|
(#2843)
swap circuits in engraving for distilled water
|
|
* CO2 and CO loop price fix
* overshot some values
|
|
(#2822)
|
|
change method return
|
|
* first push to use new Materials for circuits
* dont deprecate or redefine ultimate
* sa
* move it
* second round
* dont deprecate or redefine advanced
* part 3
* part 4
* part 5
* part 6
* mini fix
|
|
* Add barebones PurificationPlant class
* Make simple 3x3 structure to form purification plant
* Add base purification unit class and dummy sifter unit MTE
* Make sifter unit form
* Fix accidental wildcard import
* Implement basic linking of units to controller using data stick
* Make linking more robust, save bidirectional links, add scanner output
* add linking range, error message and unregister old controller when re-linking
* Add link status of purification units to waila body
* Disable maintenance issues on purification plant units
* spotless
* Check structure of linked purification units in main controller
* Remove all star imports
* Small refactor to avoid updating status from main controller
* spotless
* Attempt to document current code
* Convert some comments to javadoc
* Implement basic processing cycle, sync it with linked purification units
* Make water purification plant drain power
* Calculate power drain from active units and remove controller power drain
* spotless
* Add very barebones recipemap
* Fix recipemap name in lang file
* spotless
* Fix purification unit recipemap name
* spotless
* more sane amount of max fluid outputs
* add some item outputs to sifter unit
* Very simple recipe processing, may be buggy
* spotless
* Implement recipe failure
* Implement void protection for purification units
* spotless
* buff item output odds slightly
* Add WIP grade 1 structure
* spotless
* Store base success chance in recipe metadata and display it in NEI
* Fill sifter plant with water
* Add comment
* Allow construction sifter unit in survival
* Implement water boost
* Fix water boost allowing output chance to go over 100%
* Implement failed recipes outputting lower tier water
* Fix typo
* Fix deformed purification unit still drawing power
* Slightly refactor recipe check so base class can read result
* Create empty ModularUI container for purification plant
* The great gui struggle part 1
* More gui struggles, we have a button now
* Adjust button text and size
* gui wars: the rise of the sync
* gui wars: a new hope
* fix the sync
* is pengu old enough to know exceeder?
* Fix being able to link the same unit multiple times
* Sync status string to client
* Sign sifter with my name
* Show status somewhat properly
* Adjust sifter base chance and structure
* Fully implement sifter unit
* More tooltip refactoring
* Add structure info to sifter tooltip.
* nitpicking tooltips
* Adding sound to Purification Plant Main Unit.
* fix star imports
* Add basic coagulator unit, add recipemap for it
* Write coagulator tooltip
* comma nitpicking
* more tooltip work
* small refactor to purification plant controller
* start work on custom recipemap frontend
* Fully implement coagulator
* Update structure requirements in tooltips
* Move controller text in structure tooltips to be consistent
* fix NPE on world load
* Add base ph adjustment unit MTE
* Add info to main controller and energy hatch check
* Fixing tooltip of Main Controller & Energy/Exotic Hatch check.
* Create full pH adjustment structure
* disallow any voiding on purification unit
* Small custom RecipeMap frontend for ph adjustment
* Generate random initial pH value
* Implement inserting NaOH and HCl to adjust pH
* Add easter egg
* Implement pH sensor hatch
* Properly consume HCl and round pH value to 2 digits
* Write ph adjustment unit tooltip
* Tooltip nitpicking
* Try to fix some structurelib hints
* More trying to fix hints
* Add industrial strength concrete casing block
* Add water loop sound to the game
* Document random initial pH in tooltip
* Add glass material base
* Fix spotless formatting in Textures docs because I cannot take it anymore
* Add glass texture
* Try adding transparent glass
* Transparent glass working
* Create pH resistant glass and update pH structure to use it
* Create full structure for main purification plant
* Create custom water purification casing block
* Properly balance ferrous wastewater reprocessing and reduce input by a factor 10
* Add pH factor to NEI tooltip and fix coagulator structure
* Structure tooltip for Purification Plant base
* Add GT_Block_Glass2 and properly set maxMeta
* Add Tinted Industrial Glass blocks
* Fix BlockCasing9 not showing custom tooltip
* Register tinted glass as EV glass
* Add sterile water plant casing and revert tooltip change
* Mention required water in sifter tooltip
* Add more textures and casings
* Add more textures, sounds and add structure info for pH adjustment
* Rename sifter unit to clarifier
* Rename coagulation unit to flocculation unit
* Add activated carbon line
* Fix unintended activated carbon recipe
* Add activated carbon filter
* Add polyaluminium chloride + solution
* Add new custom textures by @BlueHero233
* Wip recipe page with new background for flocculation
* Fix flocculation background image mostly
* Finally aligned the slots
* angery mumbles
* Finish flocculation recipe page
* All the recipe pages!
* Add new reworked textures
* Fix ph adjustment being t3 instead of t4
* Fix invisible casing
* apply chembalance to polyaluminium chloride properly
* Fix ferrous wastewater -> flocculation waste liquid
* Move flocculation to grade 3
* create ozonation unit with placeholder blocks
* add new blocks for ozonation with placeholder textures
* Add water to ozonation structure
* Create ozone gas material
* Add ozone recipe
* Add textures for ozone unit
* Add sound loop for ozonation
* fix
* implement ozonation mechanics
* Finalize ozonation tooltip
* Create dummy plasma heater multi
* Update textures for plasma heater
* Add grade 5 recipemap
* Add hatches to plasma heater multi
* Add basic plasma heating unit variables
* Implement plasma heating unit mechanics
* Add plasma heater tooltip
* Add structure info to plasma heater tooltip
* fix ozonation tooltip, add frontend
* Fix positioning on ozonation tooltip and fix plasma heater crash
* Add UV treatment MTE and structure without textures
* Revert accidental addition of debug dependencies
* Add initial version of uv unit textures
* update naquadria casing, add water color gradient
* Some minor cleanup and added docs
* Create lens housing bus
* Add lens bus to UV treatment unit
* Add lens indicator hatch
* Merge GT_MetaGeneratedItem_03.java
* Add lens indicator hatch
* Add the lens cycle, uv treatment recipe map and fix eut of flocculation recipe
* Implement lens swapping mechanic
* Clean up first lens swap
* Fix uv recipemap lang and move lens cycle to recipe
* Write uv treatment tooltip
* Add sounds for uv and plasma steps
* Create empty degasifier class
* Create temporary debug structure for degasifier
* set temp casing index for degasifier
* create degasifier control hatch
* create slightly less temporary but still temporary structure for degasifier
* Start impl of degasifier
* fix fluid consumption and nbt loading of degasifier
* Degasifier implementation should work now
* Rename and reformat some things and start work on degasser tooltiop
* give last bit much lower chance of being on to avoid cheesing
* Finish degasifier tooltip
* Integrate some deleno lore
* hopefully fix all moved casing meta ids after merge
* Create finalized degasser structure
* Integrate more deleno lore
* Add even more lore
* Create placeholder particle catalysts and fetch particle items from gt++
* Fix wrong casing and recipemap localization
* Create parallel config menu
* refactor purification recipecheck slightly
* implement parallel amount on water i/o and power
* add tooltip info about parallel config
* fix text
* update block names in structure tooltips
* create structure tooltip for degasser
* create textureless quark catalyst items
* add the purple glass
* fix lore typos
* fix some casing indices
* remove concrete floor from water plant and reword tooltip
* fix main plant structure and add placeholder structure for t8 step
* fix structurecheck for main plant and add random catalyst generation for t8
* implement basic mechanics for particle extractor (wip)
* Create plasma heater frontend
* implement final mechanics and bugfixes for particle extractor
* add recipes for re-aligning quark catalysts
* add simple recipes for catalyst alignment
* initial replacement of purified water in engraver recipes
* add purified water to all wafer cutting recipes
* fix purified water amounts
* buff quark cyclotron recipe again
* extract t8 unit casings into their own icons
* Write initial tooltip for t8 module
* add purified water to mask recipes
* Add recipe comparator to show low tier purified water recipes first
* add min casing check to waterline multis
* buff ozone production
* update t8 structure
* make purified water optional again for naq wafers
* Fix blockrenderer for purification plant
* fix nei previews
* fix nei
* really fix nei this time
* add t8 lore
* fix hatch recipe locking blocking automation on some steps
* try to solve weirdness with grade 3 recipe
* fix issues with recipecheck
* fix missing null check
* make ph sensor use a strict inequality check
* fix min casings on t5
* significantly nerf purified water usage for beamline masks
* disable void protection for waterline
* small adjustments to t6 unit
* more small adjustments to t6 unit to prevent easy automation cheese
* fix degasser redstone output and missing return statement
* remove water QFT catalyst recipes
---------
Co-authored-by: Tianyou Mei <meitianyou94@gmail.com>
Co-authored-by: OlliedeLeeuw <ollie.riemersma@xs4all.nl>
Co-authored-by: Ollie_de_Leeuw <154506304+OlliedeLeeuw@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
(#2806)
* Reduce multipliers in Ichorium rotors
-> Reduce multipliers for steam and gas from 30 to 6.
* Swap costs and tiering between XL Gas and SH Steam
- Changed the tiering of material inputs for the recipes of the two turbines, so they swap tiers (Gas becomes LuV, SH Steam becomes IV).
* Fix tiered LuV material in some GT++ recipes
- Change Chrome to Rhodium-Plated Palladium in the tiered material list used in some GT++ recipes.
* Spotless apply for branch XLGT_Changes for #2806 (#2807)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Laser engraver boilerplate and structure
* Made a rough, untextured laser renderer
* Laser renderer is kind of functional
* Laser renderer follows curve
* Laser turns on/off when recipe is running
* Sampsa laser
* Color changing boilerplate
* Registered all gt lenses
* Fixed default renderer to white
* NBT reading functional
* Stole SE code to try and get TE working. It does not
* Laser renderer finally functioning with more than 1 laser!
* Moved tick count to TileLaser so lasers don't tick each other
* Implemented laser source hatch
* Structure update + spotless
* Switched to the GT_Values tier list
* Update tooltip and message player about rendering toggle
* Allow fluid input/output
* Attempting to give proper name to laser plate
* Fixed laser plate name
* New laser plate texture
* New casing just dropped
* Allow UMV glass to use any laser source
* Switched laser to a simple line renderer instead of a model
* Fixed hatch texture I missed earlier
* Spotless
* Controller textures
* render: New laser renderer
- Use GL quad rendering instead of line rendering to fix scaling
- Set lightmap coords (Emit bloom glow with shaders)
- Set opacity to 1.0
- Slight cleanup
* Got rid of the old laser model
* Tweaked some numbers on the renderer
* Spotless
* cleanup
* I give up on rotation, I've spent too much time trying to get this to work
* Got block item working I think
* Fixed tooltip for laser and multicanner
* Support bartworks lenses
* Finishing touches
* Removed unneeded assignment
* Allow UXV lasers to do all recipes
* Forgot to call super for nbt data...
* Replace magic numbers
* oops, spotless
* Another magic voltage number
* Rotations and mirror flips
Now with spotless
* fixed west/east
* ok but actually fixed now, mixed up west/east with north/south
* Updated laser source snapping to account for rotation being allowed
* Cleanup rotation axis and remove unecessary nbt
* Re-added nbt but actually load it properly now
* Fix NEI displaying lots of hatches
---------
Co-authored-by: LekKit <50500857+LekKit@users.noreply.github.com>
Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
* first few files outlining new lathe multi
* MultiLathe: Attempt to add tiers based on pipes
* MultiLathe: Added Item Pipe Casing blocks and tiers
* MultiLathe: Finished Machine and its mechanics
* MultiLathe: Add recipe map and recipes for new precision lathe mode
* MultiLathe: Apply Spotless
* Revert recipe map changes
* remove a few more recipe additions
* revert to basic lathe recipe map for the multi
* fix imports and make them all explicit
* remove a few more * imports, update tooltip info
* Update src/main/java/gregtech/common/blocks/GT_Block_Casings11.java
Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
* Added to the texture list documentation for blocks
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
|
|
* Adds output locking for non-ME output buses
* Add data stick support for output bus filters
* Small optimization to output bus iteration
* spotless, my one true enemy
|
|
Disable expecited recipe check by default and add a button to enable behavior + optimize
|
|
* Add offset between 1 and 20 to every multiblock to spread recipeChecks around
* Change to 100 buckets instead to have even distribution
* Make random offset final
|
|
remove old integer method
|
|
use manual electrolysis recipe
|
|
* fix
* better fix
|
|
* delete conflicting recipes (they never existed anyway?)
* oil distillation recipe changes
* nerf naphtha burn value
* adjust recipe times to the input changes
* adjust to 100L oil input
* add circ 9 recipes
* recipe times
* fractions
|
|
* Load time optimization: replace recipe reflection with mixin accessor
* Save an inner loop allocation in StaticRecipeChangeLoaders
* Move Bauble event handler from individual items to GT++ proxy
* Update mobs info with more optimizations
|
|
Fixes fluid extractor recipes that come from forestry
Co-authored-by: BucketBrigade <apple12a1@hotmail.com>
|
|
* Add expedited recipe checks for autopulling Stocking Hatch and Bus
* Change to proper Item and FluidStack comparison operators
* Forgot one
* And a negation
* Spotless apply for branch stockingHatchNotifications for #2748 (#2765)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Change Steam Centrifuge
* Change Steam Compressor
* Change Steam Macerator
* Change Steam Washer
* Change Steam Water Pump
* Added sounds for Steam Water Pump and Steam Washer
* Change recipe ULV input and output hatch
* Added sounds
|
