Age | Commit message (Collapse) | Author |
|
* testing
* Fix textures
* Adding Drops, still need to add furnace recipe
* Need to fix the multiple smelting recipes. otherwise stuff works.
* part 2
* Remove wip block code I added
* Moved it to a new processing file
* Fix Oredict and add a stone dust chance output. And added a config option for fortune bonus.
* Finally got Spotless to work
* fix config system set it in gregtech config with oredropbehaviour in gregtech.cfg
* Added new option and an option that returns it to the old behaviour.
* Moved the raw ores to meta3 since meta1 was full. (MetaID range fix)
* Fixing the MBM to only process small ores with fortune.
* New config option
* try to fix the recipes not working on Zeta
* Implement Caedis Fortune fix
* Added comment
* Spotless
* Fix stone dust amount from macerator
* Adding Raw ore to the OreFactory (Untested)
* spotless
* Update this to actually drop the amount number of stack, instead of the stack set to the amount
* New Random function for fortune
and shapeless crushing recipes for the raw ores.
* Fix
* Actually make the block per dimension.
* Fix an () issue. And make this actually work ingame. and not just randomly.
* Change back drops
Ned to look into Silk Touch more
* Enable Silk Touch
* Wth Spotless?, THIS made you complain?
|
|
|
|
* Wireless Activity Detector; Power On/Off Activity Detector
* Wireless Gui Redesign
---------
Co-authored-by: slprime <history-21@yandex.ru>
|
|
* add magmatter
* add quark gluon plasma
* remove nanites
* forgot chem formula
|
|
* Add Drone Centre
* Apply texture and model
* Update en_US.lang
* Remove import.*
* Switch to block render
* Balance range and break chance
* Add recipe
* Spotless
* Update lang
* Fix recipe
* Rewrite connection system and UI
* Remove debuff party
* Spotless
* Fix server class not found
* A stupid enough recipe
* Another bad recipe
* Update tooltip & i18n
* Close it!
* Spotless
* Disable draggable
* prohibited remote control when centre is offline
* Rename
* Rename; Change specifiers
* Update texture
* spotless
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
Panels (#2289)
* Adds several UI elements to multiblock drills
* Adds metrics transmitter cover and associated sensor card
* Fixes item icons and item name
* Adds tooltips for adv. sensor card and metrics panel, fixes card/overlay icons, adds recipe for metrics cover
* Refactor cover tab sync to send much smaller ISerializable payloads
* Remove unused variable
* Additional master merge cleanup
* Adds interface for custom metrics export, adds oil drill support
* Adds support for metrics covers retaining attached machine name for tooltip, metrics
* * Adds discrete coordinates to Metrics Cover data
* Adds machine to advanced sensor card tooltip
* Adds cycle time and minimum energy hatch tier to multiblock ore drill tooltips
* Moves many tooltip strings to i10n
* Remove old GT_DisabledWhileActiveButton.java file that crept in during a messy merge
* Spotless
* Improve oil and ore drill metrics, more i18n
* Addresses PR review concerns, adds more situations for self-destructing sensor cards
* Remediates further PR concerns
|
|
* Delete old texture
* Delete old texture (low quality...)
* New versions of deleted textures
* Deleting old texture
reading comprehension
* aaand add the new textures
I need to learn to work github better.
|
|
* Delete old texture
* Delete old texture (low quality...)
* New versions of deleted textures
|
|
* TE items cant be required
* remove from itemlist
* TE does not exist
* this never worked anyway but also unecessary
* these are broken. have a working replacement already
* give valid id to fix rockbreaker fake recipes
* fix texture and text
* no NC its fake anyway
|
|
* generate nanite
* textures
* recipe
* timepiece instead
* spotlessApply (#1998)
Co-authored-by: GitHub GTNH Actions <>
* add primordial matter
* texture
* add recipe
* primordial matter instead of uum
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* add eternity
* textures
* timepiece
* disable ebf + freezing
|
|
* Add items
* textures
|
|
* Bump forestry
* Add night upgrade to Industrial Apiary
* Add texture
Co-Authored-By: Runakai1 <48415331+Runakai1@users.noreply.github.com>
* Update dependencies.gradle
---------
Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com>
|
|
* Add items
* Add error-tier tooltip
* localisation
* textures
|
|
* fix: fix Steam Valve not being configurable
* Revert "fix: fix Steam Valve not being configurable"
This reverts commit 505d9e273b48315fde154490e116d58fed46ffaf.
* feat: add steam regulator
* feat: add superheated steam to steam valve
|
|
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
|
|
* New texture
* Blade
* Change molten space and time names.
* Update fluid names
* Bump dep of AE2
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* Update ItemList.java
* Add files via upload
* Delete wetwareSoC.png
* Add files via upload
* Create 550.png.mcmeta
* Update GT_MetaGenerated_Item_01.java
* Update 550.png.mcmeta
|
|
|
|
* Inf renderer working + fuzzy halo on cosmic neutronium.
* Helper method
* Cosmic nt nearly done
* Glitch renderer
* Working!
* Add comment
* Cosmic Nt finished
* Cosmic render appears
* Universium Renderer nearly done
* New material universium
* Dep
* Dep
* Universium
* Some more changes
* Spotless apply for branch RenderingMaterials for #1592 (#1593)
* Fix Battery Buffer accepting more than 1 items per slot (#1590)
* Unify sodium persulfate amount (#1591)
Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent.
See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context
* spotlessApply
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Better textures for universium maybe?
* Fixed cosmic Nt
* Remove glitch renderer (not used)
* Rename universium renderer
* Rename universium renderer
* Change Colour to Color (begrudgingly)
* Gray infinity halo
* Remove halo
* Fix off axis rotation on dropped universium and some new textures
* More universium stuff
* Cell render works
* Inf render
* Working inf
* Universium done but no fluid outside of cells rendering
* Fluid rendering
* Comment
* Spotless apply for branch RenderingMaterials for #1592 (#1634)
* Fix Battery Buffer accepting more than 1 items per slot (#1590)
* Unify sodium persulfate amount (#1591)
Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent.
See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context
* fix it (#1597)
* Fix tooltip for required input hatches (#1599)
* Allow resource packs to override individual progressbar textures (#1596)
* Allow resource packs to override individual progressbar textures
* spell: every + singular
* Fix potential crash on server with FallbackableSteamTexture
* Add colored voltage tier display for Waila (#1598)
* Add colored voltage tier display for Waila
* Adapt to new methods
* fix oredict name (#1600)
Fix wrong oredict for blizz comb
* fix it (#1601)
* adds molds and recipe generation (#1603)
* Delete water from recipe (#1604)
* Added Shortcut because simply dull (#1594)
* Added Shortcut because simply dull
* I always forget to remove a dep
* Increase Recipe Time
To fit the original recipe chain
* spotless :(
* Upped the recipe to ZPM
and increased educt/product side by 16
* make sugar maceration recipe shorter (#1586)
* make sugar maceration recipe shorter
(cherry picked from commit 55d85dc6ab315da3eb31e41667317e127a2059fe)
* spotlessApply (#1587)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>
* fix reed to sugar recipe
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Add light, medium and heavy oil to get lube (#1584)
* Add light, medium and heavy oil to get lube
Add distillation recipe to get lube out of oil
add control circuit
* spotlessApply (#1585)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>
* fix misstype
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* remove autogenerated SiSG ebf recipe (#1588)
(cherry picked from commit 4d3052e50b7de739c89c339d37a24297f3bb70fc)
* Remove void break from fluid tanks and chests (#1602)
* Remove void break from fluid tanks
Previously, sneaking while breaking a fluid tank would void the contents of the tank, leading to potential loss of valuable resources. However, this behavior is not consistent with other blocks, such as chests and furnaces, which retain their contents when broken while sneaking.
This commit removes the sneak breaking voiding behavior for fluid tanks, bringing them in line with other blocks and reducing the risk of unintended loss for players.
* run spotless
* fix stray check for voidBreak
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* remove override
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* remove void tooltip
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* fix (#1605)
* Fix inconsistency in naming (#1606)
* Add a way to remove a furnace recipe using the output instead of input (#1609)
* add method
* change method to remove all recipes with said output
* Naphthenic acid (#1589)
* add burn value for NaphthenicAcid 60k in Semi Fluid generator
(cherry picked from commit 3fa145932b64025067e807f4ff900f51029d07bd)
* add Naphthenic acid recipes and change a few
(cherry picked from commit 8b6b6d72dd79b4549dccd3732ccca6e219dd8ce7)
* spotless
* fix error
(cherry picked from commit db7b322cece6cf151f92ab6aa467bc8e4c84bda8)
* Chemical balance fixes
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
* Fix plasma turbine EU output (#1607)
* Revert "Turbine efficiency helper (#1562)"
This reverts commit 3c852a0143cbfa864da59bdd0b2edab1fa4bf146.
* Restore efficiency helper
* Spotless
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
* disable auto recipe (#1611)
* possible fix (#1614)
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12139
(cherry picked from commit 64f7433f2fab2eff618bb25997c303516fdab3f8)
* Add Failsafe for getCasingTextureForId to prevent null page. (#1612)
* Improve NEI customizability (#1583)
* Move descriptions to recipemap
* Move tooltips to recipemap
* Move overlays to recipemap
* Use shared code for generating grid positions
* 2 fluid inputs for freezer recipes
* Add deprecation javadoc
* Fix (#1616)
Allows players to use any rubber instead of just one. As other tiers have that.
* Heating element change (#1618)
* Changed (sg) to * instead (#1620)
* add transcendant metal pipe and multiple pipe (#1619)
* fix drills not generating and using less material (#1623)
* fix LV steam valve (#1624)
* TungSteel to TPV (#1622)
* fix waila displaying wrong generated eu/t (#1621)
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Add a Overclock Calculator for multis and the like to use (#1617)
* add calculator and unit tests
* use math.ceil
* math.ceil everywhere
* add some more unit tests and add onetick discount possibility
* add an exception when trying to get the consumption before calculating
* spotless oops
* convert PCB Factory to use the OC calculator
* fix tests trying for wrong values
* fix copy paste error
* address reviews
* this should be there too.
* add callhook for pre block destroy (#1625)
* add callhook for pre block destroy
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* spotless
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Change Tungstensteel to Require TPV Coils (#1628)
* Fix Blue Steel and Bismuth Bronze mixing (#1629)
* blue steel
* bismuth bronze
* Add new Weed-EX 9000 (#1615)
* Add new Weed-EX
* Add more pollen
* Change material ID
* Remove fluid recipes
* Remove pollen
* Remove cells
* Balance adjustment for the LCR Nitrobenzene recipe. (#1631)
* nitrobenzene balance
* SA
* zpm instead
* force compound to be grouped together in chemical formula (#1630)
* force compound to be grouped together in chemical formula
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* patch up glass chemical formula
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* merge two toString
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Allow overriding more progressbar textures & Add document for resource packs (#1632)
* spotlessApply
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com>
Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com>
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Ethryan <dborrfors@gmail.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Comment
* Glee8e
* Spotless
* fix
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Weird error
* Spotless
* Material ID
* Universium fluid working
* Fix some inf renderer issues
* Remove try catch
* Cosmic neutronium fixes, but no fluid rendering yet.
* Working
* Spotless...
* Fake frame
---------
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com>
Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com>
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com>
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Ethryan <dborrfors@gmail.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
|
|
(#1691)
|
|
* Begin addition of tiered material manipulation
* Dwarf matter
* Add hardcoded EU tiers for wider usage.
* New material images etc
* Nugget processing tiers
* Move iron nugget to wrought iron smelting to the correct place
* Add white dwarf shapes
* Add white dwarf shapes
* Additional retiering options for EU consumption on material part generation
* White dwarf matter complete
* Tier neutronium processing at ZPM
* Spotless
* More adjustments
* Renaming files
* Add new overlays for magneto material and more name adjustments
* Add no recipes subtag
* Spotless + name adjustment
* Undo isCustom to maintain potential public variable references in addons.
* Undo isCustom to maintain potential public variable references in addons.
* Fix fluid registry corruption.
* Add rotor EU override
* Add rotor EU override
* Make neutronium mass more reasonable
* Add proper time adjustments to rotor (probably an old oversight)
* Adjust enums to use VP rather than recalculate
* Fix typos on EU usage
* spotlessApply (#1672)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Change setProcessingMaterialTierEU to accept long.
* Small fix
* Add space and time materials
* Add new forge hammer support
* Update tooltip
* Expand laser engraver slots.
* spotlessApply (#1673)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Reserve texture page.
* Modernise GT circuit usage
* Add oversight in assembler frame recipe
* Add missing MHDCSM overlay textures
* Remove small and tiny MHDCSM dusts
* Fix error in ingot texture
* Fix NO_RECIPES not applying to frame boxes
* Restore missing ingot
* Add rod handles for materials
* Fix frame box auto generating with NO_RECIPEs tag
* recipe
* Spotless
* Add MOD_ID_GTPP as modid
* spotlessApply (#1675)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Remove smelting spacetime from furnace (why does this exist?)
* Recipes + new storage blocks for materials
* Bedrockium LuV -> EV
* SpaceTime UMV -> UIV
* TranscendentMetal UIV -> UEV
* MagnetoThingy and dward mats UXV -> UMV
* update buildscript
* yeet magic number that could be
* spotlessApply
* Make the nanite tier 3, colen request
* Up nanite tier
* Comment
* Change name
* Change name
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: adam riondy <adampoplol@gmail.com>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
|
|
* Optical Line-Water line & Items
* Spotless apply
* Spotless applies + Optical Board
|
|
|
|
* Base work for ModularUI compat
* Remove useless interface
* Add almost all the widgets
* Invert method
* Refactor NEI stack placement positions
* NEI handlers on ModularUI
* Add some more docs
* AdvDebugStructureWriter
* Fix NEI progressbar not working
* PrimitiveBlastFurnace
* clean
* derp
* clean
* spotlessApply
* Boilers
* Buffers
* clean
* N by N slots containers
* Fix boilers not having bucket interaction
Put opening UI to individual MetaTEs
* Maintenance Hatch
* clean
* spotlessApply
* Add dependency
* IndustrialApiary
* Adapt to ModularUI change
* Base work for covers & fix crash with MP
* Fix crash with server
* Rewrite base work for covers
* Send initial cover data on cover GUI open
so that the time of showing incorrect data will be eliminated
* Covers part 1
* Rename package: ModularUI -> modularui
* Rename class: GT_UIInfo -> GT_UIInfos
* Fix build
* Covers part2
* Fix missing client check with tile UI & fix title overlap
* CoverTabLine
* Move cover window creators to inner class
* Fix crash with null base TE
* Close GUI when tile is broken
* Color cover window with tile colorization
* add nanites as a material
* spotless
* start the work on the nanites multi
* spotless
* Change signature of addUIWidgets
* FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank
* Add title tab
* Move package: modularui -> modularui/widget
* add controller recipe and new casing
* add prefix and the casing and controller to the item list
* add nano forge controller to its item
* add nanites to PreLoad
* Programmed circuit + IConfigurationCircuitSupport
* clean
* add nano forge multi - complete with some recipes
* new nanite textures
* Apply spotless
* fix nanites not registering, remove recipe lock on the nano forge, other small fixed
no clue why they didn't want to register in run2.
* VolumetricFlask
* Remove integrated circuit overlay from recipe input slots
* Input Hatch & Quadruple Input Hatch
* Multiblock
* Deprecate old cover GUI
* BasicMachines
* Finish BasicMachine & NEI
* Expand DTPF NEI to 9 slots
* Fix ME input bus on MP
* Move AESlotWidget to public class
* Move GT_Recipe_Map constructors with mNEIUnificateOutput to setter method
* Move SteamTexture.Variant to outer enum
* Switch to remote repository
* oops
* Update MUI
* Update MUI
* Minor refactor for change amount buttons
* the start of a new multi, tooltip WIP
* Display items and fluids that exceed usual count
* blah
* use +=, why didn't I do this
* add tier 2 and tier 3. add some more checks
* Update MUI
* Move ModularUI to Base (#1510)
* Move ModularUI to Base
* Move most of the ModularUI functionality to `BaseTileEntity` (and `CoverableTileEntity`)
* `CommonMetaTileEntity` delegates ato the MetaTileEntity
* Added several interfaces (with defaults) to indicate if a tile/metatile override/implement certain behaviors.
* Moved `IConfigurationCircuitSupport` interface such that it will work with BaseTileEntity or a MetaTileEntity
* Address reviews
Co-authored-by: miozune <miozune@gmail.com>
* Update MUI
* make a single shape rotatable by 90 degrees
* Minor changes to NEI
* more shapes, more mechanics
* Return :facepalm:
* IGetTabIconSet override
* Some more changes to NEI
* Merge texture getter interfaces to new class GUITextureSet
* Remove BBF structure picture as it's auto-buildable now
* Make unified title tab style of texture angular
* Expose some boiler texture getters for addon
* Fix crash with cover GUI on pipe
* small changes
* Lower the number of recipe per page for DTPF & update MUI
* Update MUI
* Fix crash with middle-clicking slot on circuit selection GUI
* Fix circuit selection window not syncing item from base machine
* Merge GT_NEI_AssLineHandler into GT_NEI_DefaultHandler
* Update MUI
* Add in TecTech multi message
* Allow changing the way of binding player inventory
* Update MUI
* Update MUI
* Update MUI
* Update MUI
* Update MUI
* Make MUI non-transitive to allow addons to use their own version
* Force enable mixin
* Format fluid amount tooltip
* Add GUITextureSet.STEAM
* Add guard against null ModularWindow creation
* Add constructors for Muffler Hatch with inventory
* Fix output slot on digital chest and tank allowing insertion
* Don't log null ModularWindow
* add a new material, add some recipes, continue the work on the PCB factory. The first recipe is in!
* oops spotless
* update bs
* rename casings
* make material generate plates
* add recipes to the pcb factory
* nei handling
* do some more work on the multi
* fixes to recipes.
* Update build-and-test.yml
* starter work on the PCBFactory GUI. recipe check fully working
* finish gui work
* spotless
thank god drafts don't generate spotless PRs
* final touches. tooltip tomorrow
* fix typos. and finish PCB multi.
* spotless
* changes for requests
* make consumed amount a constant
* fix recipes oopsie
* Remove unused textures
* Add nanites
* fixing recipes
* Fix NEI not showing
* Make nanites share texture
* actually fix recipes and use 2 new lenses
* finally circuits work in recipe
* Add trans metal block
* add default offsets
* spotless
* make parallels actually work
* Downscale nanite texture to 64x64
* improve PCB Factory GUI
* finish fixing gui, fix offsets on cooler, apply a new formula for duration
* Clean up PCB Factory tooltip
* Spotless
* Fix typo in Naquadah
* make sure the roughness multiplier actually slows down the recipe XD
* add a smaller limit to the roughness multipler.... lets not allow for 10x board prodction oops
* fix cooler tier 2 using wrong block in its center, fix controller texture on tier 3
* update mui and uodate the button texture
* fix one button and prevent null arrays
* remove some math. a small rework on recipes
* fix and off by 1
* save the change? never heard of it
* fix tier 3 not forming
* Nano forge tooltip
* hopefully fix nano forge. fix neutroni nanite wrong tier in recipe
* try 2 to fix structure check
* fix nano forge not forming
* fix nano forge data stick. we need better error messages
* do some fixes.
* its 12am, typos....
* never coding at midnight again
* try 2 to fix nano forge and pcb factory
* fix nano and pcb factory not working. address some reviews
* do syncing between client and server. fix recipes asking too much power with multiple upgrades
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Jason Mitchell <mitchej@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Sampsa <sampo.vanninen@aalto.fi>
|
|
|
|
* Add New Items Related to the QFT Tiers
* spotlessApply (#1515)
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Small Addition to Composite Description
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
to Gregtech (#1447)
* Update forestry
* Apply new formula (+uncap the chance)
* Yeet gendustry upgrades
* Conversion recipes
* Add upgrade frame
* Remove recipes
* Gendustry way
* Yeet gendustry
* Fix
|
|
* Pocket Multitool
* :spotlessApply
* Revert ":spotlessApply"
This reverts commit f1421c537c25627bb3d56ddca4fa610d90b16b07.
* :spotlessApply again
|
|
|
|
|
|
|
|
* fix sprite abuse
* Spotless apply for branch fix/sprite-abuse for #1347 (#1348)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
* convert gaia spirit
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Update some textures to be more consistent and have proper black spots in pipes
* Brighter textures
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* Add FluidLimiter Cover
* Update ItemList.java and register
* Add texture
* Refactor method
|
|
* Fix possible out-of-bounds error.
* Bye bye OpV
* Bye bye OpV
* Some textures while I'm here
* Test
* Maybe
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* Move materials to new class and remove some old comments.
* Move materials to new class and remove some old comments.
* New mat textures
* RGB Fixes
* Change material stats
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* New recipe methods.
* Pulverise tesseracts
* New pulveriser method
* Cleanup code
* Smelting/cooling methods
* Super coolant
* Add hot ingot
* Expand DTPF UI
* Add energised tesseract
* Disable incorrect freezer recipe.
* Remove compressor recipe + adjust values of transcendent metal a bit.
* Fix missing textures
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* Upgrade changes
* 6
* Handle some crazy bee outputs
|
|
* Industrial Apiary
* Make Forestry not required.
* Add support for gendustry upgrades and lower energy demand
* Add item validation to input slots and fix battery + special slots
* Automation upgrade support and bug fixes
* Better canWork check and flower detection
* GUI work
* Better detection of modifier update
* Add button to cancel process
* Add textures
* Tooltip changes
* Add convert crafting
* Make top and sides glow
* Bug fix
* New textures
* Add bee effects
* Make all tooltips translatable
* Implement GT Apiary Upgrades
* Prevent inserting too many upgrades
* Just require gendustry instead of checking it everywhere
* Add blacklist (bug fix) and use hashsets instead of arrays
* Cache beemember to do effects
* Make blacklist automatic
* Add acceleration upgrades for all tiers (LV -> UV)
* Lock the machine to maxspeed by default
* Correct required energy in info tooltip
* Use isUpgrade method instead of manually checking
* Lower amperage to 4
* Save locked speed to nbt
|
|
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
|
|
* Localisation of inf coils
* Make GT storage blocks a valid beacon.
* Improved infinity textures (again), thanks Jimbno.
* Adjust author colour
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* add first recipes for Kevlar Line
* merge conflict
* add more materials and recipes for kevlar line
* fix butanol naming
(cherry picked from commit 808c91e2904314f67085c8cce2d579d6ac711bbb)
* fix more Kevlar recipes
(cherry picked from commit 3688dda0a8d4cd79edd76072d04a59fe4e8b3ca4)
* fix more recipes
(cherry picked from commit a527b22bd815629372c8dca98e579628b1128d46)
* add more Kevlar stuff
* add more materials for Kevlar Line
* add more Materials and recipes for Kevlar
(cherry picked from commit 448083f5c1789cd78cc1dc049c859c3bec4c2485)
* Merge branch 'Kevlar' into dev
# Conflicts:
# src/main/java/gregtech/api/enums/Materials.java
* add second maven from ic2
* overseen
* add more kevlar materials and recipes
* fix naming
* fix metal block 9 was not set
* fix materials and names
(cherry picked from commit 3119d83ba53f43de6163de3f01edd6081f318cd6)
* Fix Acetylen Material
(cherry picked from commit d379365de519c503a78f68ce5ab2a3de02ff7852)
* fix recipes
(cherry picked from commit 2e2033773e1aa92224932fc93aaadaeacb83e8ba)
* remove Calcium Hydroxide Formula
* add ALF3
* make Nitrochlorobenzene backwards compatible
fix a lot of recipes
(cherry picked from commit ca2a59db88f036649f6d8ff4b5e5565c9da400c9)
* add more Kevlar materials
fix recipes
remove Nitrobenzene 3 and 4
* remove 2 Buten 1,4 Diol
fix recipes
(cherry picked from commit 811549dc9f4f73e77752d5faef2b6d7243e6e625)
* add spinnert Item, Woven and fiber kevlar
add more materials
add more recipes
* fix derp
(cherry picked from commit dc1e24753c39c70ad262f7bc2ce70d839a655942)
* fix materials id derp
(cherry picked from commit c7ba51ad846ae466054fb5e002fa8c634e3dfcad)
* fix recipes
(cherry picked from commit f8e6e32acaee563d3683b79980459bc464c6e716)
* fix more recipe
add Kevlar material
add fiber and woven kevlar recipes
(cherry picked from commit cc99809ea80f616ffe5c22e0d3f189a7b5cd7bdb)
* add Spinneret recipe
(cherry picked from commit 4db8497380b39edda8a00964613eae3a72cebbcb)
* add Bromine
add Liquid Kevlar Texture
fix recipe
add more Kevlar Materials
(cherry picked from commit e2f96cb825f5ededaff3989b7e087b51b57a913c)
* Fix recipes
(cherry picked from commit e4f8d0d33f81f94124b733cbeb975ca0b4a33da2)
* fix recipes
(cherry picked from commit 7c6b7cdd0fd0720f58993faeaa81dd95d1b3757c)
* Add more Kevlar recipes
add more Materials
(cherry picked from commit 9c35ca47e917fb2ac082ba5077e65001a7ab074a)
* add more Materials
(cherry picked from commit 12c598fe8784198c996eda3d5e072b829cf33ab8)
* fix Kevlar recipes
add more recipes
* finish kevlar line
(cherry picked from commit 39567610956ac02d3001f68851ddeb7e5d63aed7)
* fix a few more recipes
(cherry picked from commit e28283321ce1670d6684a47c0fd3fd263da8a6cb)
* fix recipe
(cherry picked from commit df89c96bc826b321f81c1c3af521469decdcff22)
* try to add back single block distillation recipes
* stupid me :)
(cherry picked from commit 7fc6c375605d85b7cc791aa9818174a1cb2f7f59)
* fix distillation recipes
(cherry picked from commit e2351c4390b632b9e361a19ba03225c82766e455)
* fix more recipes
(cherry picked from commit 0fefb881e80659d41308dec85c59a114862aaf40)
* remove not working texture
(cherry picked from commit f70cdbf7e0138ed6cc867153693db527f04a78f8)
* fix more recipes
(cherry picked from commit 6c45aa36d4176af8f41e64a8758e31618ac56ab9)
* rename chemicals
(cherry picked from commit 4aa52352319b72bca6ec27ea65aba42bd293bb39)
* fix recipes
(cherry picked from commit 0885006add9ce78614a4a45cc8ae1d46a5b466d8)
* remove unused Kevlar Materials
(cherry picked from commit 69525c04a6505ef06e1f7cc6166aaba808b0ba26)
* add more Kevlar changes
(cherry picked from commit a16f12fe71fa65ce7706b049b5e94602cb676b37)
* change Kevlar line a bit
(cherry picked from commit b06cdb634125465e073adf1e09f1821b8794d243)
* add Rhodium as compat metal
(cherry picked from commit cfde983db03efec6d83367cbd5c13887eef6aa67)
* fix texture set
(cherry picked from commit 7f2f5508acb3613505522db98eef948c8e269892)
* add more Kevlar recipes
disable Rhodium GT dummy
(cherry picked from commit 9389fe086e9d8a4bef92115a9eef8816fdf51c43)
* fix recipes
(cherry picked from commit 7dd26f59af45619c3cf2045edfb6c38198358cb0)
* fix more recipes
(cherry picked from commit b407abebd0ce1d5351b770a729d75fb3fc7a0e87)
* fix more recipes
(cherry picked from commit f2c24ea7fe4a2dfb9a95129d9a0c4b03b70f34d5)
* fix kevlar recipes
(cherry picked from commit fb9f937b7f31ab9f3f958a0a53772c82f0d55b64)
* add chemical Formular
(cherry picked from commit 5116ee58132bb1723c318e8f2c20b52f97da3b9d)
* fix recipe
(cherry picked from commit ce10e89e059946f7020219f2a79397862272d2ab)
* fix circuit
(cherry picked from commit 0ee7d4535dab0bb1a20665160f11bdf01efd411d)
* fix most of the Kevelar recipes
retier them
remove potassium Nitrate its still Saltpeter
(cherry picked from commit 49e1eec47c4c86044ce748d96dc5a11d1db68877)
* add back Potassium Nitrate for compt reasons
(cherry picked from commit eee82dc1783d40fe4b68d87ee0da646cc4ea5262)
* fix more Kevlar recipes
(cherry picked from commit aaaf2969da671cf923f7213f71e9c8eb89091e87)
* fix name in Kevlar line
(cherry picked from commit e7a883254d2c89f289453cdcd67be5dc1fc1c53a)
* Lowered EU cost on Wood Tar
- Lowered EU/t on the Wood Tar DT recipe from 256 to 224 EU/t (value suggested by Dream). The old value is just a bit too high for an HV Semifluid Generator to power the DT with the Creosote output, which forced lower tier generators and spam.
* Removed DT Recipes and Added Alternatives
- Removed circuits in DT recipes for the HV Oil and Benzene processing;
- Added IV recipes to obtain the new chemicals for the Kevlar line (the Dimethylbenzene isomer and Naphthenic Acid), without changing the setup of players that were previously processing those for their early-mid game purposes.
* Revert "Removed DT Recipes and Added Alternatives"
This reverts commit 165ad2e4d196b5966af0fe282658f1bea3d579a9.
* Revert "Lowered EU cost on Wood Tar"
This reverts commit 420d0d5cd530d3e29164c3a9c384d4187a46495a.
* fix Copper oxide use old Material
Shift ids
add melting Point
(cherry picked from commit 488d6598513307bb4221bbb50904a32e5a0bd069)
* Update GT_Loader_Item_Block_And_Fluid.java
* MAchine REcipe code too large
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux8 <steelux7@gmail.com>
|
|
* remove autogenerated recipes (electrolyzer)
* change Silicon to Raw Silicon
add Silicone SG and EG for Solar Panels and circuits
add new materials fro Silicon Line
* add more materials and recipes fro Silicon line
* add more materials for silicon line
add more recipes
* re arranged materials and add it to material builder
change gases
(cherry picked from commit 2706242d1d41221eaf2311d7f05a3f6c1358feb0)
* derp
(cherry picked from commit 208fc734f474eda26364e8e3c345969b0f57032d)
* change famular
add recipes that use all Quartz variants (SiO2)
Add ebf Si recipes with all quartz variants
change tep to 2273k (2000°C)
(cherry picked from commit 0a9fc9f8aeddd19918e2ccb4d2d41bbbaf9c3b18)
* Add new Blocks doe Sieg and Sisg
move cryolite to metal blocks
change Boule recipes to use new SI variants
(cherry picked from commit 26074610edaf62c891953a2005948ef1716a3bcd)
* Add new Blocks doe Sieg and Sisg
move cryolite to metal blocks
change Boule recipes to use new SI variants
(cherry picked from commit aa0d37acc501ff6151cd46a759386e424a41a573)
* rename sisg and sieg
(cherry picked from commit 55f81a2418bf76cbed4d8e6b1db37ce22d0a8729)
* re enable electrolyzer autogenerated recipes
* add Formular to Quartz
(cherry picked from commit 57057fb4f3892911e4ef7f5bd7c3be09edecebd5)
* add centrifuge recipes to brick dust
add Quartz dust to BBF recipes (Ferrosilite)
change Lava recipe output dust instead of small dust
Add Quartz dust to Chalcopyrite EBF recipes
(cherry picked from commit dfe920ebba18bc7d330a8c9ae5dc00b01c2f7bb6)
* add new materials for Silicon line
add fluid to Hexachlorodisilane
add mor si line recipes
* Committer: Martin Robertz
fix broken recipes
set output fluids and items to 6
* add a way to electrolyze Dichlorosilan
(cherry picked from commit ff82a5d04e0a182ebd13efd1b24de74fcddeba2a)
* add ebf to Sieg and Sisg
fix some si line recipes
(cherry picked from commit 79b5ecbcedfa0fe0f056a1369ed9f127ae26e9b8)
* add electrolyser recipe for Hexachlorodilisilan
fix recipe
(cherry picked from commit e6b012f77760707ef5fdbfb656f7b08fdc06cd8b)
* change chemical Famular from Trichlorsilane
fix recipes and add cell varaint recipes
(cherry picked from commit 8207edcbb82523646c20af3c9d6ba6a1d61a366f)
* add a few cell recipes
fix recipe
(cherry picked from commit 36dac62eacbfe55baae4a6a8ceb2d79637214335)
* add Poly and Mono to SI name
change back Boule recipes made out of SIsg
(cherry picked from commit 83cafb97df22319f1b3191bc9eeb38bbddec8623)
* add Gallium Arsenide Crystal for Boule recipes
(cherry picked from commit 436fbe52230bf12cd3f02b7b7f3376c8d2dba882)
* add 4 output slots to cutting machines (hv and up)
add Silicon dust to Wafer recipes (recycling)
(cherry picked from commit 7a5bb72fcc9337a6841e7c7f0e487eee3d8b363b)
* remove fluids from Boule cutting process
add diamond sawblade to recipe (not consumed)
(cherry picked from commit 1b5f14da1352eacb78bdd8466c4de7e42ccbfb8a)
* fix SI typo
fix Cutter4 slots can be used
(cherry picked from commit a258cfd7747a0ed5ed164a5e8c7a0ecd0f67ca76)
* change recipe
change fluid position in chemical rector multi
* resolve conflicts
* fix fluid stack visual bug in chemical reactor if fluids >3
(cherry picked from commit 6e509b36d3a5a702f0354e6d683ecc5aa095c7cf)
* fix recipes
* change recipe times
(cherry picked from commit 86302a7476a5985e862f8ae0242f77444a41ed37)
* fix LCR not showing item and fluids overriden
thanks to miozune
* Update Materials.java
* Fix SI recipes
(cherry picked from commit 4c6ff96ead83e53b7fe4cab79ba8f07a13ae2476)
* fix mire SI recipes
(cherry picked from commit dc3aac372e5bdbc08b7de49f55325a260ed0a21f)
* fix recipes SI
(cherry picked from commit e077a6976e6614f547aa3ce4215208a85aef3dca)
* buff this recipes a bit.
(cherry picked from commit 334c6e5eb8224525116fd2a9fe340feef38c6579)
* fix typo
(cherry picked from commit d0eae40c64f44ab6d207891ff8a8ae30f5988cd8)
* remove SIeg
(cherry picked from commit 59f870d04234454bd73131aadfecff0cfdac2266)
* remove Sieg recipes
(cherry picked from commit 80c501f210ff30726c37a74f1cfec4844138273f)
* remove SIeg Block
* remove SIeg
* fix Tooltip Grammar for Gallium Arsenide Crystal #10221
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10221
* fix [Conflicted Recipe] Monocrystalline Silicon Boule cannot be made in LV EBF #10308
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10308
(cherry picked from commit 7acd07346add055cb729205de1a50ae8381e3d47)
* fix Silicon Processing Line Feedback #10228
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10228
(cherry picked from commit bc71c9ccb0aac338aedb2a282d0859d7c4fd07d2)
* Make the circuits used in silicon boules smelting more consistent (#1079)
(cherry picked from commit b1e994efce0bedb5ae10c5f6468b07a0cac9068a)
Co-authored-by: repo-alt <wvk17@yandex.ru>
|
|
* Basis of changes.
* Fix item stack and fluid vanishing.
* Add new plasma forge UI, change tooltip and fix recipe map.
* Fix corrupted fluid registry.
* Fix fluids in recipes. Items still need adjusting.
* Working.
* Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly.
* Make animation of spacetime fluid slower.
* Fix recipe map (again).
* Remove screwdriver junk. Clean up code slightly.
* More cleaning.
* Comments
* Add hatch limitations and add some additional information. Also update NEI GUI.
* Add proper recipes and change SpaceTime to a fluid not a gas.
* Remove depreciated coil check (since I stole the IDs).
* Remove depreciated coil check (since I stole the IDs). Add more comments.
* Change temp of SpaceTime.
* Add catalyst recipes + support for 16:16 fusion recipes.
* Add comments.
* Scala fix maybe?
* Change plasma forge GUI.
* Uncap temperature of materials. (Short -> Int)
* Add chunkloading support (when multi is active).
* Fix NEI merge issues.
* fix used ids in kevlar
* Add fluid support for laser engraver.
* fix sh***t
(cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc)
* Add new intermediate materials to facilitate crafting. Also fix fusion typo.
* Fix heat/fluid quantity display to be formatted correctly.
* Change recipes to be more balanced.
* Change residue fluid texture.
* Restore better naming for multiblock.
* Fix recipe typo.
* Fix text not wrapping in multi controller.
* Give laser engraver internal fluid storage.
* Add IMC NEI support.
* Update material properties.
* Remove old dev comments.
* Fix NEI texture.
* Update/fix plasma forge recipes.
* Increase max hatch count.
* Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time.
* Fix spacetime recipe.
* Update spacetime textures and add new item textures.
* Remove manual spacetime fluid addition.
* Add custom fluid texture override ability.
* Update infinity and spacetime to use new custom fluid override texture.
* Depreciate old recipe adding methods.
* Refactor GT NEI handler.
* Remove unnecessary import.
* Remove debug comment.
* Clean up auto generated fluid code.
* Fix NPE and add a few comments.
* Refactor GT NEI handler.
* Update NEI GUIs.
* More NEI fixes.
* Update LCR NEI GUI.
* Update error message.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|