-
Notifications
You must be signed in to change notification settings - Fork 176
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Largest PR ever #88
Merged
Merged
Largest PR ever #88
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
serenibyss
approved these changes
Aug 19, 2021
Yefancy
added a commit
to bruberu/GregTech
that referenced
this pull request
Aug 21, 2021
commit 713fd9e Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 23:33:54 2021 -0700 Fix for null materials being entered into the washedIn pair (GregTechCEu#98) commit e0d55c8 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 22:59:08 2021 -0700 Allow specifying the amount of fluid for chemical bath processing (GregTechCEu#97) commit 98e3bef Author: froot <66188216+kumquat-ir@users.noreply.github.com> Date: Fri Aug 20 22:38:12 2021 -0700 Material Tree JEI page returns (GregTechCEu#66) commit 0f6c8b7 Author: KilaBash <yefancy@foxmail.com> Date: Sat Aug 21 13:11:31 2021 +0800 GuideBook stuff (GregTechCEu#46) commit 63adb22 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 22:05:50 2021 -0700 Fix infinite Energy emitter decrement amperage not working (GregTechCEu#94) commit f0c9a84 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 23:54:37 2021 -0500 fix oilsands recipe commit 0dc9f97 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 21:44:06 2021 -0700 Fix Infinite Emitter breaking particles (GregTechCEu#93) commit f8f1284 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 23:08:35 2021 -0500 remove multi fluid pipes for Wood commit 0672a79 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 22:21:01 2021 -0500 fix primitive multis workable fix diamond composition commit c50fdb2 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Fri Aug 20 23:18:33 2021 -0400 fix the default output side on quantum tanks/chest (GregTechCEu#92) commit 5c46453 Author: PrototypeTrousers <salomaoo@gmail.com> Date: Fri Aug 20 23:24:16 2021 -0300 "Better Idling" for MTEs (GregTechCEu#91) Co-authored-by: Exa <11907282+Exaxxion@users.noreply.github.com> commit 835b5b9 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 21:12:55 2021 -0500 make battery tooltips better commit 78e37f7 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 20 03:53:31 2021 -0400 add tiered superconductors commit 4eb9133 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 02:13:06 2021 -0500 add new EV-UV batteries commit 1e6ff1e Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 01:00:52 2021 -0500 remove line from build.gradle commit 312c188 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 19 19:39:11 2021 -0500 fix log warning about missing recipe property commit d76afa3 Author: Rongmario <rongmario@gmail.com> Date: Thu Aug 19 07:32:25 2021 +0100 Add config to turn on/off GT adding loot (GregTechCEu#87) commit 4fa4e3f Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Thu Aug 19 08:30:20 2021 +0200 Fix issue from GregTechCEu#80 (GregTechCEu#88) commit c7e9f84 Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Thu Aug 19 08:27:07 2021 +0200 Pipefixes (GregTechCEu#80) * i forgor release() commit aba97f0 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 23:23:30 2021 -0500 clean out dead prefixes (will cause ID shift) commit 0bbdc65 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 23:21:03 2021 -0500 clean up current batteries commit b59f0dc Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 22:13:06 2021 -0500 finish Supercon value on WireProperty commit 5018bbe Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 23:24:12 2021 -0500 add some missing iconset files from gregicality commit ce2d5fe Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 22:39:13 2021 -0500 add `heat` getter to fusion reactor commit 3e599b5 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 20:50:58 2021 -0500 remove ExNi stuff (in Gregification) commit 0cb6427 Author: Dane Strandboge <dane@strandboge.com> Date: Tue Aug 17 01:21:31 2021 -0500 Primitive Multi Rewrite (GregTechCEu#85) * new PBF working * implement primitive recipes * finish PBF * refactor Coke Oven * update changelog * fix tech memeing on me commit 61a52db Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 21:47:28 2021 -0500 update changelog for GregTechCEu#75 commit d51ae3e Author: bruberu <80226372+bruberu@users.noreply.github.com> Date: Mon Aug 16 21:46:42 2021 -0500 Add Highlighting to the Crafting Station (GregTechCEu#75) commit 36ef039 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 21:03:29 2021 -0500 relocate `RecipeMapSteamMultiblockController` commit 13b7827 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 02:00:04 2021 -0500 clean up components, make constructor public commit 77ce62e Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Mon Aug 16 08:58:55 2021 +0200 rework creative energy (GregTechCEu#84) commit 48b1284 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 01:33:26 2021 -0500 add circuit markers to CraftingComponent commit 2100c86 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 00:55:09 2021 -0500 rework crafting component loading commit 612bc74 Author: Rongmario <rongmario@gmail.com> Date: Mon Aug 16 02:11:59 2021 +0100 De-enumify MaterialIconSet + MaterialIconType (GregTechCEu#82) - Names are converted to the right format in the ctor commit 826556a Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 17:11:57 2021 -0500 pull changes from upstream GregTechCEu#1710 commit 0ef0b33 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 17:08:44 2021 -0500 add some MetaItem MaterialInfos commit 523627d Author: Rongmario <rongmario@gmail.com> Date: Sun Aug 15 16:33:16 2021 +0100 No longer hardcode biomes for primitive water pump (GregTechCEu#81) - Now utilizes Forge's BiomeDictionary types - Ocean/River => `Type.WATER` (1000) - Swamp => `Type.SWAMP` and `Type.WET` (800) - Jungle => `Type.JUNGLE` (350) - Snow => `Type.SNOWY` (300) - Plains/Forest => `Type.PLAINS` and `Type.FOREST` (250) - Taiga => `Type.COLD` (175) - Beach => `Type.BEACH` (170) commit 85b3e98 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 01:34:08 2021 -0500 update changelog for EnergyNet updates commit 7a9b1db Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Sun Aug 15 08:32:02 2021 +0200 Electric pipes rework (GregTechCEu#78) commit 757264a Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Sun Aug 15 02:17:23 2021 -0400 reinstate metaArmor classes (GregTechCEu#79) commit 11ecde2 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 00:57:00 2021 -0500 remove energy field projector, cleanup commit 73f6bdc Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 22:38:35 2021 -0500 update changelog for buffers commit dc81fa8 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 22:37:29 2021 -0500 port the Buffer to CEu commit fa1b388 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:59:18 2021 -0500 pull changes from upstream GregTechCEu#1701 commit 2bede3b Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:48:36 2021 -0500 merge changes from upstream GregTechCEu#1709 commit db8a4a9 Author: Tech22 <swarren2022@gmail.com> Date: Sat Aug 14 20:45:52 2021 -0400 change isotope element symbols to a dash commit 6eff9e6 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:45:39 2021 -0500 fix Water missing fluid tooltip commit ecae98a Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:14:34 2021 -0500 add `.chancedOutputs` builder call for List commit 5a40354 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 18:08:29 2021 -0500 add some missing material flags commit 59fb179 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 14:43:23 2021 -0500 buff Indium (small over tiny dust) commit 6f82857 Author: Tech22 <swarren2022@gmail.com> Date: Sat Aug 14 12:49:04 2021 -0400 change distillation EUt to reflect config commit 9e10cf2 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 02:27:23 2021 -0500 add more changes, fix some mistakes commit 82fb254 Author: Dane Strandboge <dane@strandboge.com> Date: Sat Aug 14 02:03:55 2021 -0500 fix some changelog mistakes commit 4289c65 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 02:01:26 2021 -0500 add GTCEu changelog (probably missed something) commit 90c4e2f Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 00:55:44 2021 -0500 fix DT outputs sometimes on wrong layers commit 859bcb9 Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Sat Aug 14 07:03:57 2021 +0200 Fluid pipes rework, MultiFluid Pipes (GregTechCEu#53) commit ba74b2f Author: Rongmario <rongmario@gmail.com> Date: Fri Aug 13 21:56:25 2021 +0100 Made material tool enchantability not implicitly tied to icon sets (GregTechCEu#76) * Made material tool enchantability not implicitly tied to icon sets - Nano Saber gets 33 enchantability, it inherited platinum's enchantability before but right now platinum doesn't have the tool property - Deprecated old static helper method to get a material enchantability (delete outright?) * Remove deprecated method commit 1b3c241 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 02:58:17 2021 -0400 infinite water cover tweaks commit 9a7af7d Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 02:30:35 2021 -0400 add recipes to adjustables, simple washer commit d4b0dfa Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 13 01:22:47 2021 -0500 add infinite water cover commit 664bd32 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 00:44:57 2021 -0400 add simple washer commit 807092a Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 23:42:24 2021 -0500 Revert "remove RecipeMap minimums" This reverts commit 201c564. commit 806dfd2 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 22:08:39 2021 -0500 small cleanup on OreProperty commit bf2e397 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 22:06:24 2021 -0500 require DustProperty for oreByProducts commit eb03b82 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:57:28 2021 -0500 port Native EU to FE commit d1bceee Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:39:32 2021 -0500 port Diodes from Gregicality commit 3c4a9cf Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:06:28 2021 -0500 Squashed commit of the following: commit 22cf316 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:05:58 2021 -0500 Revert "clean up duplicated code in energy hatch" This reverts commit 44b1b7f. commit 44b1b7f Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 20:07:39 2021 -0500 clean up duplicated code in energy hatch commit 0163764 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 15:51:32 2021 -0400 adjustable energy hatches commit 6acee86 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 14:57:21 2021 -0400 adjustable transformers commit 45e27fa Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 03:28:29 2021 -0400 fix off-centered lignite gem texture commit 254ea67 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 03:26:32 2021 -0400 better coke oven jei page commit 19ce515 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 02:05:19 2021 -0500 add method for addons to register MTEs easily commit f0c75f2 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 00:19:46 2021 -0500 merge material changes from multi PR commit 308d436 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 23:06:11 2021 -0500 more code cleanup commit 3789f4b Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 22:40:41 2021 -0500 clean up configs a bit commit 052fd4e Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 20:36:08 2021 -0500 add registration, CT method commit b6cad8c Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 20:30:45 2021 -0500 port MetaOreDictItem commit c1e9780 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:58:54 2021 -0500 make addOrePrefix take varargs commit afe3e35 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:54:46 2021 -0500 make `addOrePrefix` public commit 09600d2 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:30:58 2021 -0500 make OrePrefix constructor public commit cde0631 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 18:59:45 2021 -0400 fix extra facade material recipes being registered commit 292ff21 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 18:47:10 2021 -0400 use dimension names for gas collector property commit 189f645 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 10:41:27 2021 -0400 fix missing resource location commit 724b20e Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 10:36:10 2021 -0400 add missing components to H2S and FeCl3 commit 18c4373 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 02:19:53 2021 -0400 prevent DT jei page overlaps commit 201c564 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 01:20:18 2021 -0500 remove RecipeMap minimums commit 9a307e1 Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Wed Aug 11 01:30:34 2021 -0400 Add Cryogenic Air Recipes (GregTechCEu#74) commit d1a5619 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:58:21 2021 -0500 clean up tool classes impl commit 41ff7ce Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Wed Aug 11 00:51:19 2021 -0400 Update ToolWrench.java (GregTechCEu#70) commit cdd9923 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:46:33 2021 -0500 clean up steam-era recipe duration and EUt commit e53885d Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:19:16 2021 -0500 :monkey: dust blocks :monkey: commit 81f2eef Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:13:29 2021 -0500 rename bricked steel hull commit 8f5ad1d Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 22:58:53 2021 -0500 make steam great again commit 346ce2c Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 21:05:59 2021 -0500 rework Steam Machine logic commit 8288ff0 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 20:22:02 2021 -0500 wipe recipe cache on multiblock deformation commit f1e6a95 Author: Tech22 <swarren2022@gmail.com> Date: Tue Aug 10 19:10:51 2021 -0400 make NaOH not power positive, change cumene to consume H3PO4 commit b37cdf2 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 22:49:04 2021 -0500 fix issues in UniversalDistillationBuilder commit 30cf93c Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Mon Aug 9 20:28:52 2021 -0400 Quantum Tanks/Chests can now disallow input from their export face via screwdriver (GregTechCEu#69) commit 95d1f58 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 18:54:31 2021 -0400 fix crate guis commit a4634bd Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 17:56:17 2021 -0400 fix drum TOP display commit b1ac5e5 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 02:23:41 2021 -0400 add toolstats to Flint commit a22aa35 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 02:12:04 2021 -0400 fix missing filter and crate recipes commit 019ed53 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 01:04:54 2021 -0500 remove ULV from overclock button commit 98a6ca6 Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Mon Aug 9 02:04:08 2021 -0400 Add Gas Collectors (GregTechCEu#68) * add dimension-specific gas collectors commit 17d8f74 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 01:53:14 2021 -0400 add polished stone autoclave recipes commit 90b8e04 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 00:25:49 2021 -0500 trim lossless wire configs commit 4f36d36 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 00:16:30 2021 -0500 clean up MetaTileEntities commit 161a216 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 23:12:45 2021 -0500 add UV-UXV circuit assembler lang keys commit a65bbaa Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 22:05:16 2021 -0500 fix crash on furnace recipe removal commit 932be0f Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 21:57:13 2021 -0500 add debug logging to recipe removals commit 7f557a9 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 21:09:03 2021 -0500 config to disable in-world concrete commit 2cd6159 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sun Aug 8 18:29:28 2021 -0700 A bunch of small cleanups (GregTechCEu#67) * Slight cleanup of unused constructors Slight fix to Assembly Line JEI page Remove Legacy method of specifying surface rocks * Fix typo in Electric Furnace recipe map localization
bruberu
added a commit
that referenced
this pull request
Aug 21, 2021
* Start on clipboard GUI * Complete everything up to the actual rendering * Don't forget the buttons * Remove TileEntity systems, since they're not really needed * Wait, this shouldn't be an MTE :thonk: * Fiddle around with blockstates * Add proper clipboard-placing behavior * Add a clipboard back * Begin movement to MTE, by Yefancy's request * Remove aged TE code * Complete step two of four * A husk of a renderMetaTileEntityDynamic * Fix model rendering * Pull in FakeModularGui and FakeModularUIContainer, and start on a few helper functions * Create a Death Ray * Complete check 3/4 * Fix references to removed class * Tweak clipboard's location * Remove more old code * Get GUI interactivity online! (4/4) :lets: * Add crafting recipe, and fix some minor issues * ...Why was that there? * Fix more various bugs * Fix more bugs * Fix more bugs * Fix non-in-world GUI, and add explainer text to tooltip * Fix certain formatting and extraneous import problems * Fix certain formatting and extraneous import problems * Reformat GregFakePlayer * Yeet ModelCache.java * Keep removing useless imports * Behaviour -> Behavior (as per Tech's request) * Implement @tech22's suggestions * Continue transition to behavior * Apply all of Kila's suggestions that could be simply implemented * Fix up ClipboardBehavior.java * Fix up MetaTileEntityClipboard.java * Continue removing unnecessary checks from PlayerInventoryHolder.java * Add Max's textures! * Squashed commit of the following: commit 713fd9e Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 23:33:54 2021 -0700 Fix for null materials being entered into the washedIn pair (#98) commit e0d55c8 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 22:59:08 2021 -0700 Allow specifying the amount of fluid for chemical bath processing (#97) commit 98e3bef Author: froot <66188216+kumquat-ir@users.noreply.github.com> Date: Fri Aug 20 22:38:12 2021 -0700 Material Tree JEI page returns (#66) commit 0f6c8b7 Author: KilaBash <yefancy@foxmail.com> Date: Sat Aug 21 13:11:31 2021 +0800 GuideBook stuff (#46) commit 63adb22 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 22:05:50 2021 -0700 Fix infinite Energy emitter decrement amperage not working (#94) commit f0c9a84 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 23:54:37 2021 -0500 fix oilsands recipe commit 0dc9f97 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Fri Aug 20 21:44:06 2021 -0700 Fix Infinite Emitter breaking particles (#93) commit f8f1284 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 23:08:35 2021 -0500 remove multi fluid pipes for Wood commit 0672a79 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 22:21:01 2021 -0500 fix primitive multis workable fix diamond composition commit c50fdb2 Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Fri Aug 20 23:18:33 2021 -0400 fix the default output side on quantum tanks/chest (#92) commit 5c46453 Author: PrototypeTrousers <salomaoo@gmail.com> Date: Fri Aug 20 23:24:16 2021 -0300 "Better Idling" for MTEs (#91) Co-authored-by: Exa <11907282+Exaxxion@users.noreply.github.com> commit 835b5b9 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 21:12:55 2021 -0500 make battery tooltips better commit 78e37f7 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 20 03:53:31 2021 -0400 add tiered superconductors commit 4eb9133 Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 02:13:06 2021 -0500 add new EV-UV batteries commit 1e6ff1e Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 20 01:00:52 2021 -0500 remove line from build.gradle commit 312c188 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 19 19:39:11 2021 -0500 fix log warning about missing recipe property commit d76afa3 Author: Rongmario <rongmario@gmail.com> Date: Thu Aug 19 07:32:25 2021 +0100 Add config to turn on/off GT adding loot (#87) commit 4fa4e3f Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Thu Aug 19 08:30:20 2021 +0200 Fix issue from #80 (#88) commit c7e9f84 Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Thu Aug 19 08:27:07 2021 +0200 Pipefixes (#80) * i forgor release() commit aba97f0 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 23:23:30 2021 -0500 clean out dead prefixes (will cause ID shift) commit 0bbdc65 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 23:21:03 2021 -0500 clean up current batteries commit b59f0dc Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 18 22:13:06 2021 -0500 finish Supercon value on WireProperty commit 5018bbe Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 23:24:12 2021 -0500 add some missing iconset files from gregicality commit ce2d5fe Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 22:39:13 2021 -0500 add `heat` getter to fusion reactor commit 3e599b5 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 17 20:50:58 2021 -0500 remove ExNi stuff (in Gregification) commit 0cb6427 Author: Dane Strandboge <dane@strandboge.com> Date: Tue Aug 17 01:21:31 2021 -0500 Primitive Multi Rewrite (#85) * new PBF working * implement primitive recipes * finish PBF * refactor Coke Oven * update changelog * fix tech memeing on me commit 61a52db Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 21:47:28 2021 -0500 update changelog for #75 commit d51ae3e Author: bruberu <80226372+bruberu@users.noreply.github.com> Date: Mon Aug 16 21:46:42 2021 -0500 Add Highlighting to the Crafting Station (#75) commit 36ef039 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 21:03:29 2021 -0500 relocate `RecipeMapSteamMultiblockController` commit 13b7827 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 02:00:04 2021 -0500 clean up components, make constructor public commit 77ce62e Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Mon Aug 16 08:58:55 2021 +0200 rework creative energy (#84) commit 48b1284 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 01:33:26 2021 -0500 add circuit markers to CraftingComponent commit 2100c86 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 16 00:55:09 2021 -0500 rework crafting component loading commit 612bc74 Author: Rongmario <rongmario@gmail.com> Date: Mon Aug 16 02:11:59 2021 +0100 De-enumify MaterialIconSet + MaterialIconType (#82) - Names are converted to the right format in the ctor commit 826556a Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 17:11:57 2021 -0500 pull changes from upstream #1710 commit 0ef0b33 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 17:08:44 2021 -0500 add some MetaItem MaterialInfos commit 523627d Author: Rongmario <rongmario@gmail.com> Date: Sun Aug 15 16:33:16 2021 +0100 No longer hardcode biomes for primitive water pump (#81) - Now utilizes Forge's BiomeDictionary types - Ocean/River => `Type.WATER` (1000) - Swamp => `Type.SWAMP` and `Type.WET` (800) - Jungle => `Type.JUNGLE` (350) - Snow => `Type.SNOWY` (300) - Plains/Forest => `Type.PLAINS` and `Type.FOREST` (250) - Taiga => `Type.COLD` (175) - Beach => `Type.BEACH` (170) commit 85b3e98 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 01:34:08 2021 -0500 update changelog for EnergyNet updates commit 7a9b1db Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Sun Aug 15 08:32:02 2021 +0200 Electric pipes rework (#78) commit 757264a Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Sun Aug 15 02:17:23 2021 -0400 reinstate metaArmor classes (#79) commit 11ecde2 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 15 00:57:00 2021 -0500 remove energy field projector, cleanup commit 73f6bdc Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 22:38:35 2021 -0500 update changelog for buffers commit dc81fa8 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 22:37:29 2021 -0500 port the Buffer to CEu commit fa1b388 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:59:18 2021 -0500 pull changes from upstream #1701 commit 2bede3b Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:48:36 2021 -0500 merge changes from upstream #1709 commit db8a4a9 Author: Tech22 <swarren2022@gmail.com> Date: Sat Aug 14 20:45:52 2021 -0400 change isotope element symbols to a dash commit 6eff9e6 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:45:39 2021 -0500 fix Water missing fluid tooltip commit ecae98a Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 19:14:34 2021 -0500 add `.chancedOutputs` builder call for List commit 5a40354 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 18:08:29 2021 -0500 add some missing material flags commit 59fb179 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 14:43:23 2021 -0500 buff Indium (small over tiny dust) commit 6f82857 Author: Tech22 <swarren2022@gmail.com> Date: Sat Aug 14 12:49:04 2021 -0400 change distillation EUt to reflect config commit 9e10cf2 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 02:27:23 2021 -0500 add more changes, fix some mistakes commit 82fb254 Author: Dane Strandboge <dane@strandboge.com> Date: Sat Aug 14 02:03:55 2021 -0500 fix some changelog mistakes commit 4289c65 Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 02:01:26 2021 -0500 add GTCEu changelog (probably missed something) commit 90c4e2f Author: DStrand1 <dane@strandboge.com> Date: Sat Aug 14 00:55:44 2021 -0500 fix DT outputs sometimes on wrong layers commit 859bcb9 Author: brachy84 <45517902+brachy84@users.noreply.github.com> Date: Sat Aug 14 07:03:57 2021 +0200 Fluid pipes rework, MultiFluid Pipes (#53) commit ba74b2f Author: Rongmario <rongmario@gmail.com> Date: Fri Aug 13 21:56:25 2021 +0100 Made material tool enchantability not implicitly tied to icon sets (#76) * Made material tool enchantability not implicitly tied to icon sets - Nano Saber gets 33 enchantability, it inherited platinum's enchantability before but right now platinum doesn't have the tool property - Deprecated old static helper method to get a material enchantability (delete outright?) * Remove deprecated method commit 1b3c241 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 02:58:17 2021 -0400 infinite water cover tweaks commit 9a7af7d Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 02:30:35 2021 -0400 add recipes to adjustables, simple washer commit d4b0dfa Author: DStrand1 <dane@strandboge.com> Date: Fri Aug 13 01:22:47 2021 -0500 add infinite water cover commit 664bd32 Author: Tech22 <swarren2022@gmail.com> Date: Fri Aug 13 00:44:57 2021 -0400 add simple washer commit 807092a Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 23:42:24 2021 -0500 Revert "remove RecipeMap minimums" This reverts commit 201c564. commit 806dfd2 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 22:08:39 2021 -0500 small cleanup on OreProperty commit bf2e397 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 22:06:24 2021 -0500 require DustProperty for oreByProducts commit eb03b82 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:57:28 2021 -0500 port Native EU to FE commit d1bceee Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:39:32 2021 -0500 port Diodes from Gregicality commit 3c4a9cf Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:06:28 2021 -0500 Squashed commit of the following: commit 22cf316 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 21:05:58 2021 -0500 Revert "clean up duplicated code in energy hatch" This reverts commit 44b1b7f. commit 44b1b7f Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 20:07:39 2021 -0500 clean up duplicated code in energy hatch commit 0163764 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 15:51:32 2021 -0400 adjustable energy hatches commit 6acee86 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 14:57:21 2021 -0400 adjustable transformers commit 45e27fa Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 03:28:29 2021 -0400 fix off-centered lignite gem texture commit 254ea67 Author: Tech22 <swarren2022@gmail.com> Date: Thu Aug 12 03:26:32 2021 -0400 better coke oven jei page commit 19ce515 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 02:05:19 2021 -0500 add method for addons to register MTEs easily commit f0c75f2 Author: DStrand1 <dane@strandboge.com> Date: Thu Aug 12 00:19:46 2021 -0500 merge material changes from multi PR commit 308d436 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 23:06:11 2021 -0500 more code cleanup commit 3789f4b Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 22:40:41 2021 -0500 clean up configs a bit commit 052fd4e Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 20:36:08 2021 -0500 add registration, CT method commit b6cad8c Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 20:30:45 2021 -0500 port MetaOreDictItem commit c1e9780 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:58:54 2021 -0500 make addOrePrefix take varargs commit afe3e35 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:54:46 2021 -0500 make `addOrePrefix` public commit 09600d2 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 19:30:58 2021 -0500 make OrePrefix constructor public commit cde0631 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 18:59:45 2021 -0400 fix extra facade material recipes being registered commit 292ff21 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 18:47:10 2021 -0400 use dimension names for gas collector property commit 189f645 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 10:41:27 2021 -0400 fix missing resource location commit 724b20e Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 10:36:10 2021 -0400 add missing components to H2S and FeCl3 commit 18c4373 Author: Tech22 <swarren2022@gmail.com> Date: Wed Aug 11 02:19:53 2021 -0400 prevent DT jei page overlaps commit 201c564 Author: DStrand1 <dane@strandboge.com> Date: Wed Aug 11 01:20:18 2021 -0500 remove RecipeMap minimums commit 9a307e1 Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Wed Aug 11 01:30:34 2021 -0400 Add Cryogenic Air Recipes (#74) commit d1a5619 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:58:21 2021 -0500 clean up tool classes impl commit 41ff7ce Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Wed Aug 11 00:51:19 2021 -0400 Update ToolWrench.java (#70) commit cdd9923 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:46:33 2021 -0500 clean up steam-era recipe duration and EUt commit e53885d Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:19:16 2021 -0500 :monkey: dust blocks :monkey: commit 81f2eef Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 23:13:29 2021 -0500 rename bricked steel hull commit 8f5ad1d Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 22:58:53 2021 -0500 make steam great again commit 346ce2c Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 21:05:59 2021 -0500 rework Steam Machine logic commit 8288ff0 Author: DStrand1 <dane@strandboge.com> Date: Tue Aug 10 20:22:02 2021 -0500 wipe recipe cache on multiblock deformation commit f1e6a95 Author: Tech22 <swarren2022@gmail.com> Date: Tue Aug 10 19:10:51 2021 -0400 make NaOH not power positive, change cumene to consume H3PO4 commit b37cdf2 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 22:49:04 2021 -0500 fix issues in UniversalDistillationBuilder commit 30cf93c Author: BraggestSage833 <46819052+BraggestSage833@users.noreply.github.com> Date: Mon Aug 9 20:28:52 2021 -0400 Quantum Tanks/Chests can now disallow input from their export face via screwdriver (#69) commit 95d1f58 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 18:54:31 2021 -0400 fix crate guis commit a4634bd Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 17:56:17 2021 -0400 fix drum TOP display commit b1ac5e5 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 02:23:41 2021 -0400 add toolstats to Flint commit a22aa35 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 02:12:04 2021 -0400 fix missing filter and crate recipes commit 019ed53 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 01:04:54 2021 -0500 remove ULV from overclock button commit 98a6ca6 Author: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Mon Aug 9 02:04:08 2021 -0400 Add Gas Collectors (#68) * add dimension-specific gas collectors commit 17d8f74 Author: Tech22 <swarren2022@gmail.com> Date: Mon Aug 9 01:53:14 2021 -0400 add polished stone autoclave recipes commit 90b8e04 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 00:25:49 2021 -0500 trim lossless wire configs commit 4f36d36 Author: DStrand1 <dane@strandboge.com> Date: Mon Aug 9 00:16:30 2021 -0500 clean up MetaTileEntities commit 161a216 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 23:12:45 2021 -0500 add UV-UXV circuit assembler lang keys commit a65bbaa Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 22:05:16 2021 -0500 fix crash on furnace recipe removal commit 932be0f Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 21:57:13 2021 -0500 add debug logging to recipe removals commit 7f557a9 Author: DStrand1 <dane@strandboge.com> Date: Sun Aug 8 21:09:03 2021 -0500 config to disable in-world concrete commit 2cd6159 Author: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Sun Aug 8 18:29:28 2021 -0700 A bunch of small cleanups (#67) * Slight cleanup of unused constructors Slight fix to Assembly Line JEI page Remove Legacy method of specifying surface rocks * Fix typo in Electric Furnace recipe map localization * compatibility * Fix remaining issues Co-authored-by: Yefancy <yefancy@foxmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.