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.

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

GTCEu 2.8.9 update #10

Merged
merged 37 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
43b75c5
Remove NuclearCraft ASM (#2467)
kumquat-ir May 4, 2024
f189493
Update zh_cn.lang (#2445)
iouter May 5, 2024
46d2dc0
Allow polarizing block -> magnetic block (#2469)
ALongStringOfNumbers May 5, 2024
d006d60
Fusion bloom fix & other bloom effect API modifications (#2470)
Tictim May 7, 2024
8c2f0c6
Inital Vintagium Support (#2463)
htmlcsjs May 7, 2024
e0a2465
Fix Ore Dict Ingredients When Changing OreDicts with CT & GS (#2456)
IntegerLimit May 7, 2024
f8c1a52
Fix the large turbine rotor texture (#2485)
M-W-K Jun 2, 2024
00f3b4d
Small QoL Bee Update (#2458)
Rundas01 Jun 2, 2024
9ce8a20
Fix excessive packets & re-renders with AEHostable parts (#2487)
M-W-K Jun 2, 2024
5c501fd
Allow dynamic hatch placement on Distillation Tower (#2477)
M-W-K Jun 4, 2024
4d3a39e
Add a faster recipe for drilling fluid with distilled water (#2484)
Zorbatron Jun 4, 2024
153ebab
Fix input busses saying "Item Auto-Output Enabled" instead of "Item A…
Zorbatron Jun 4, 2024
09e44d9
fix pyrolyse speed (#2449)
TechLord22 Jun 4, 2024
ec756bb
Brute-force Fix of RAM Usage Problem When Using Alfheim (#2475)
MCTian-mi Jun 4, 2024
97dd250
Clean up AEHostable part fix (#2488)
M-W-K Jun 4, 2024
1328835
Various Cleanroom Improvements (#2480)
vrejhead Jun 4, 2024
72e2ef2
Updating bees using the new Mutation Condition (#2486)
Rundas01 Jun 5, 2024
71816dd
Allow MTEs / recipe map workables to directly control their JEI categ…
M-W-K Jun 6, 2024
fa7b5c4
Rounds energy displayed by TOP (#1063)
Quarri6343 Jun 8, 2024
a68d66f
dependency updates
serenibyss Jun 9, 2024
132a449
Allow recipe logic to set EU/t and speed discounts (#2496)
serenibyss Jun 18, 2024
5ff7cdb
Convert from ASM to Mixins (#2192)
ALongStringOfNumbers Jun 20, 2024
b22bd78
Glass tube recycling (#2509)
Zorbatron Jun 22, 2024
2811c8e
Improve assembly line laser render (#2495)
M-W-K Jun 22, 2024
5af02a3
Dynamically change the direction of the arrow in "Manual IO Mode" to …
Zorbatron Jun 22, 2024
18a0bbc
Support Creative Mode Pick Block (#2428)
ghzdude Jun 22, 2024
981fbaa
Add Polybenzimidazole Block Conversion Recipes (#2511)
IntegerLimit Jun 29, 2024
fe65538
GroovyScript 1.1.0 (#2506)
brachy84 Jul 2, 2024
e4a86be
Update build script version to 1720106721 (#2503)
serenibyss Jul 4, 2024
bb7659e
workaround GHA bug for tests workflow
TechLord22 Jul 4, 2024
375af9e
Fix liquid and gas registry key functions overlapping (#2514)
bruberu Jul 4, 2024
e79ad8f
Namespaced MTE Registries (#2505)
TechLord22 Jul 4, 2024
e1f1440
Split assembler and circuit assembler textures (#2388)
M-W-K Jul 4, 2024
5dceed5
bump GHA versions (#2516)
TechLord22 Jul 5, 2024
837b2ab
Fix failing builds due to Vintagium (#2519)
TechLord22 Jul 5, 2024
f7ad0bc
Fix Mixin Warnings About `maxShiftBy` (#2520)
ghzdude Jul 5, 2024
1f91ce6
Merge branch 'gtceu-master'
tekcay Jul 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build_setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
cache-write-only: ${{ inputs.update-cache }}
generate-job-summary: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: ./gradlew build --warning-mode all --build-cache

- name: Publish to GitHub
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: "build/libs/*.jar"
generate_release_notes: true
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ on:
push:
branches:
- master
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
'gradlew**', 'src/main/resources/*_at.cfg']
pull_request:
paths: ['src/main/java/**', 'src/test/**', 'src/api/java/**', 'gradle/**', '**.gradle', 'gradle.properties',
'gradlew**', 'src/main/resources/*_at.cfg']
branches:
- '*'

concurrency:
group: tests-${{ github.head_ref || github.ref }}
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/update_buildscript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ jobs:

- name: Create Pull Request
id: create-pull-request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
env:
GITHUB_TOKEN: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
with:
token: ${{ secrets.BUILDSCRIPT_UPDATER_TOKEN }}
committer: GitHub <[email protected]>
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
commit-message: 'update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}'
branch: gha-update-buildscript
title: Update build script version to ${{ steps.version-check.outputs.NEW_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_gradle_wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
uses: actions/checkout@v4

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,5 @@ local.properties
run/

logs/

libs/
19 changes: 19 additions & 0 deletions addon.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

minecraft {
injectedTags.put('DEP_VERSION_STRING', "required-after:gregtech@[${modVersion},);")
}

configurations {
compileOnly {
// exclude GNU trove, FastUtil is superior and still updated
exclude group: "net.sf.trove4j", module: "trove4j"
// exclude javax.annotation from findbugs, jetbrains annotations are superior
exclude group: "com.google.code.findbugs", module: "jsr305"
// exclude scala as we don't use it for anything and causes import confusion
exclude group: "org.scala-lang"
exclude group: "org.scala-lang.modules"
exclude group: "org.scala-lang.plugins"
}
}


Loading
Loading