Skip to content
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.

Sign up for GitHub

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

Jump to bottom

PVP Leaderboard #3 #35

Merged
merged 78 commits into from
May 5, 2024
Merged

PVP Leaderboard #3 #35

merged 78 commits into from
May 5, 2024

Commits on Feb 28, 2024

  1. buff drilling fluid times (2x)

    @Houstonruss
    Houstonruss committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    12bb4a7 View commit details
    Browse the repository at this point in the history

  2. semi-flatten ore miner "fortune" 

    tt for waste
    @Houstonruss
    Houstonruss committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    4329cfe View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. le e furnace sfx

    @Houstonruss
    Houstonruss committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    2130396 View commit details
    Browse the repository at this point in the history

  2. Explosives activated by redstone. 

    Timer is inversely related to strength. 15->0s, 1->14s.
    @johnch18
    johnch18 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    7c59ce1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'mega/dev' into dev

    @johnch18
    johnch18 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    f796a1e View commit details
    Browse the repository at this point in the history

  4. Fixed inexplicable lag from a vanilla function that hasn't been touch… 

    …ed in any way shape or form :|
    @johnch18
    johnch18 committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    45c9a36 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. updated some sfx 

    add steam furnace sfx
    @Houstonruss
    Houstonruss committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    ab72d18 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into dev

    @Houstonruss
    Houstonruss committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    464ed24 View commit details
    Browse the repository at this point in the history

  3. add steam vent sfx

    @Houstonruss
    Houstonruss committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    de96298 View commit details
    Browse the repository at this point in the history

  4. add hammer sfx 

    add boiler vent sfx
    @Houstonruss
    Houstonruss committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    5d7abf0 View commit details
    Browse the repository at this point in the history

  5. lower vent sfx volume

    @Houstonruss
    Houstonruss committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    e6f6fba View commit details
    Browse the repository at this point in the history

  6. stupid hit box fix

    @botn365
    botn365 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    6312a4e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. lower vent sfx volume (it needed moar)

    @Houstonruss
    Houstonruss committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    5d531d3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into dev 

    # Conflicts:
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java
    @Houstonruss
    Houstonruss committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    98fd805 View commit details
    Browse the repository at this point in the history

  3. fixed debug energy source slider not changing voltage :)

    @johnch18
    johnch18 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    9006be4 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. no tinies from boiler 

    Todo: more dust from large fuels
    @Houstonruss
    Houstonruss committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    9a6a876 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. semifluid boiler hp -> lp

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    e5a4252 View commit details
    Browse the repository at this point in the history

  2. semifluid boiler hp -> lp

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    d34904b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into dev

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    d8e2d3b View commit details
    Browse the repository at this point in the history

  4. > Buff chalco vein 

    * less iron more copper
* lower vein weight
* higher vein density

> Iron vein now has... Iron.
* swapped brown limonite for iron.

> Small coal, iron, zinc, and copper are now *all* in the y 30-70 range so you can find them mining for most ores.
* Adjusted coal weight to compensate for depth

> Change zinc and tin material color so they are different.
    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    5f2e516 View commit details
    Browse the repository at this point in the history

  5. Tweaked PBF recipes

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    a970ffa View commit details
    Browse the repository at this point in the history

  6. Buff steel in PBF 25% faster

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    4f67173 View commit details
    Browse the repository at this point in the history

  7. Buff steel in PBF 25% faster

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    b518925 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/dev' into dev

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    bb0fb6b View commit details
    Browse the repository at this point in the history

  9. intelli crashing and breaking parsing so NOW i see the issue ffs

    @Houstonruss
    Houstonruss committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    c296780 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. removed 8 wood pulp -> 1 wood plank recipe

    @johnch18
    johnch18 committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    b99f0d4 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. fixed explosives murdering the player indiscriminately

    @johnch18
    johnch18 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    be072a6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. make axe break leaves

    @botn365
    botn365 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    93b091e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into dev

    @botn365
    botn365 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    32d9503 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. drill tt 

    gc/gs bee variant removal
remove old maint hatch recipe
metal mixture 2.0
extruder ingot to rod recipes (2x rods -> 1x long rod)
extruder ingot to rod recipes (1x speed -> 1.75x)
nerf water recipe in cutter
buff lubricant recipe times in cutter
4x lube qty. req. for cutter recipes.
long rod -> rod cutter recipe speed buff
    @Houstonruss
    Houstonruss committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    482d304 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Fixed rock breaker not following the 24 Eu/t rule

    @johnch18
    johnch18 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    87dc3b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Tiny and Small dust apocalypse

    @johnch18
    johnch18 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9cf7cb7 View commit details
    Browse the repository at this point in the history

  2. Added tunable factor for diesel fuels in boilers, `GT_MetaTileEntity_… 

    …LargeBoiler::DIESEL_FACTOR`, presently .85
    @johnch18
    johnch18 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    0257239 View commit details
    Browse the repository at this point in the history

  3. Large Combustion Engine now HV machine 

    Produces flat 32A HV, with a fuel efficiency bonus when using oxygen.
Vanilla GT recipes modified to use stainless and HV components.
Textures unmodified
    @johnch18
    johnch18 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7ffbdf2 View commit details
    Browse the repository at this point in the history

  4. Power hatch TT

    @johnch18
    johnch18 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    04b8d9c View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Made logistic machines, (filters, buffers, fluid canner), give 4 mach… 

    …ines per craft. Made super buffers use logic circuits.
    @johnch18
    johnch18 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    b165bfc View commit details
    Browse the repository at this point in the history

  2. Made logistic machines, (filters, buffers, fluid canner), give 4 mach… 

    …ines per craft. Made super buffers use logic circuits.
    @johnch18
    johnch18 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    71ba9ff View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into dev

    @johnch18
    johnch18 committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    d6376a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Added MEGA Steam Valve as discussed, texture is png file added. 

    Tested in pack with RC tanks, works fine.
    @johnch18
    johnch18 committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    3126836 View commit details
    Browse the repository at this point in the history

  2. through the power of magic, ur aluminium ITEM pipes are now FLUID pip… 

    …es 🇹🇷
    @johnch18
    johnch18 committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    f2a1be7 View commit details
    Browse the repository at this point in the history

  3. stainless steel recipe: iron -> steel 

    invar recipe: iron -> steel
better endstone/netherrack pulverizing and centrifuging
    @Houstonruss
    Houstonruss committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    8519a03 View commit details
    Browse the repository at this point in the history

  4. stainless steel recipe: iron -> steel 

    invar recipe: iron -> steel
better endstone/netherrack pulverizing and centrifuging
    @Houstonruss
    Houstonruss committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    b9ab139 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/dev' into dev 

    # Conflicts:
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
    @Houstonruss
    Houstonruss committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    f7c982b View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. update buildscript

    @FalsePattern
    FalsePattern committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    9cd0915 View commit details
    Browse the repository at this point in the history

  2. fix houston typo

    @FalsePattern
    FalsePattern committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    30680e7 View commit details
    Browse the repository at this point in the history

  3. FalseTweaks threading compat

    @FalsePattern
    FalsePattern committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    1e02524 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Made logistics machine use sort mode by default, can be toggled with … 

    …soldering iron.
    @johnch18
    johnch18 committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    5dc379d View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. add debug message for empty ore vein

    @matt-159
    matt-159 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5d2108b View commit details
    Browse the repository at this point in the history

  2. set access modifier for updateCoordinates() to protected

    @matt-159
    matt-159 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b7c0bfd View commit details
    Browse the repository at this point in the history

  3. detect ore slurry during structure check 

    - lmaoGuess() now performs a one-time scan to bedrock of a 15x15 area centered on the controller to determine the ore vein
    @matt-159
    matt-159 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3200756 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. startup time threading boost

    @FalsePattern
    FalsePattern committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e99c4c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. have nei not be terrible when using recipe maps outside of gt

    @botn365
    botn365 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8ce6bc2 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. get rid of terrible try catch ignore

    @botn365
    botn365 committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    dfac090 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. update structure lib deb

    @botn365
    botn365 committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    706754b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into dev 

    # Conflicts:
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
    @Houstonruss
    Houstonruss committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    82333ac View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. remove pbf recipes 

    fix orevein debug spam; you need to use debugWorldGen=true to see it now.
    @Houstonruss
    Houstonruss committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    9ea322b View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. solar steam boiler nerf

    @Houstonruss
    Houstonruss committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    fc60bad View commit details
    Browse the repository at this point in the history

  2. trying to set ore hardness

    @Houstonruss
    Houstonruss committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    a962acd View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Nitpicking ore mixes

    @Houstonruss
    Houstonruss committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    e40cb11 View commit details
    Browse the repository at this point in the history

  2. remove soapstone vein

    @botn365
    botn365 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    9aea6f6 View commit details
    Browse the repository at this point in the history

  3. have throttling mechanic with large boiler

    @botn365
    botn365 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0221355 View commit details
    Browse the repository at this point in the history

  4. make drills place torches instead of any block next to it

    @botn365
    botn365 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    6804375 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. buf large boilers in gt 

    make drill torch placement more reliable
get rid of code where thunder can explode machines
    @botn365
    botn365 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    9a9a7b4 View commit details
    Browse the repository at this point in the history

  2. reduce eff because off miss calculation

    @botn365
    botn365 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    80a7259 View commit details
    Browse the repository at this point in the history

  3. fix pipe z fighting

    @botn365
    botn365 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    e4c1a5d View commit details
    Browse the repository at this point in the history

  4. make boilers 3x eff instead of 2.5x

    @botn365
    botn365 committed May 1, 2024
    Configuration menu
    Copy the full SHA
    2a6a122 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. real lithium batteries only

    @Houstonruss
    Houstonruss committed May 2, 2024
    Configuration menu
    Copy the full SHA
    914042f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into dev

    @Houstonruss
    Houstonruss committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d788660 View commit details
    Browse the repository at this point in the history

  3. explosive buff

    @Houstonruss
    Houstonruss committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d0b38b2 View commit details
    Browse the repository at this point in the history

  4. reduce lv drill aoe

    @botn365
    botn365 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1a5354e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/dev' into dev

    @botn365
    botn365 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f529bfc View commit details
    Browse the repository at this point in the history

  6. remove distiled water ore washer recipes 

    make thermal centrifuge and ore washer a bit faster
    @botn365
    botn365 committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8826939 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. add multi-block highlights for AOE Drills

    @matt-159
    matt-159 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    0208510 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'funni-lines' into dev

    @matt-159
    matt-159 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6801446 View commit details
    Browse the repository at this point in the history

  3. made the drill aoe lines actually work and look good

    @Houstonruss
    Houstonruss committed May 3, 2024
    Configuration menu
    Copy the full SHA
    1b89074 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. BALLER BALLER BALLER!!!

    @basdxz
    basdxz committed May 4, 2024
    Configuration menu
    Copy the full SHA
    30b8603 View commit details
    Browse the repository at this point in the history

  2. fix drill deleting items next to it when it the stack of torches runs… 

    … out
    @botn365
    botn365 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    7487987 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into dev

    @botn365
    botn365 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    310a714 View commit details
    Browse the repository at this point in the history