Compare commits
No commits in common. "release" and "release/3.12.1.1" have entirely different histories.
release
...
release/3.
7 changed files with 12 additions and 70 deletions
2
.github/workflows/auto-pull-request.yaml
vendored
2
.github/workflows/auto-pull-request.yaml
vendored
|
@ -12,7 +12,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: pull-request-action
|
||||
uses: vsoch/pull-request-action@1.1.0
|
||||
uses: vsoch/pull-request-action@1.0.24
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
PULL_REQUEST_BRANCH: "develop"
|
||||
|
|
2
.github/workflows/create-release.yaml
vendored
2
.github/workflows/create-release.yaml
vendored
|
@ -17,7 +17,7 @@ jobs:
|
|||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/gradle-build-action@v3
|
||||
uses: gradle/gradle-build-action@v2
|
||||
|
||||
- name: Run build with Gradle Wrapper
|
||||
run: chmod +x ./gradlew && ./gradlew build
|
||||
|
|
18
CHANGELOG.md
18
CHANGELOG.md
|
@ -1,20 +1,4 @@
|
|||
# 3.13.0.0
|
||||
|
||||
Many thanks to @xyzminecraftserver for sponsoring the project!
|
||||
|
||||
This release is only rudimentarily tested since I am not currently playing the pack. Please report any issues you run into.
|
||||
|
||||
* Updated dependencies for Vault Hunters 3.13.
|
||||
|
||||
# 3.12.4.0 (2023-11-19)
|
||||
|
||||
* Updated dependencies for Vault Hunters 3.12.4.
|
||||
|
||||
# 3.12.2.0 (2023-11-14)
|
||||
|
||||
* Updated dependencies for Vault Hunters 3.12.2.
|
||||
|
||||
# 3.12.1.1 (2023-11-09)
|
||||
# 3.12.1.0 (2023-11-09)
|
||||
|
||||
* Added support for overriding the new Jeweler Expertise; disabling it now grants 3 free cuts by default.
|
||||
|
||||
|
|
|
@ -24,9 +24,9 @@ apply plugin: 'eu.davidea.grabver'
|
|||
versioning {
|
||||
// Required (number)
|
||||
major 3
|
||||
minor 13
|
||||
minor 12
|
||||
// Optional, force custom patch (number)
|
||||
patch 0
|
||||
// patch 1
|
||||
// Optional (any string)
|
||||
//preRelease "RC1"
|
||||
// Optional, custom task name to trigger the increase of the version
|
||||
|
@ -186,11 +186,11 @@ dependencies {
|
|||
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
|
||||
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
|
||||
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
||||
minecraft 'net.minecraftforge:forge:1.18.2-40.2.17'
|
||||
minecraft 'net.minecraftforge:forge:1.18.2-40.2.10'
|
||||
|
||||
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
|
||||
|
||||
implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:5076087')
|
||||
implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:4851120')
|
||||
// implementation fg.deobf('curse.maven:vault-integrations-867003:4570137')
|
||||
// implementation fg.deobf("curse.maven:refined-storage-243076:3712882")
|
||||
implementation fg.deobf('appeng:appliedenergistics2-forge:11.7.0')
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
/**
|
||||
* Copyright 2023 alterNERDtive.
|
||||
*
|
||||
* This file is part of Vault Mod Tweaks.
|
||||
*
|
||||
* Vault Mod Tweaks is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Vault Mod Tweaks is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Vault Mod Tweaks. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package tv.alterNERD.VaultModTweaks.integration.mixin;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import iskallia.vault.skill.tree.ExpertiseTree;
|
||||
import iskallia.vault.world.data.PlayerExpertisesData;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
||||
@Mixin(PlayerExpertisesData.class)
|
||||
public abstract class MixinPlayerExpertisesData {
|
||||
@Overwrite(remap=false)
|
||||
ExpertiseTree getExpertises(Player player) {
|
||||
// SkillContext.of(player)
|
||||
// something something LearnableSkill.learn(context) auf den Expertise skill für jeweler
|
||||
return this.getExpertises(player.getUUID());
|
||||
}
|
||||
|
||||
@Shadow(remap=false)
|
||||
ExpertiseTree getExpertises(UUID uuid) {
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -35,6 +35,6 @@ There are some bug fixes and a lot of QoL and balance changes. See https://git.a
|
|||
[[dependencies.the_vault_tweaks]]
|
||||
modId="the_vault"
|
||||
mandatory=true
|
||||
versionRange="[1.18.2-3.11.0.3011]"
|
||||
versionRange="[1.18.2-3.11.0.2820]"
|
||||
ordering="AFTER"
|
||||
side="BOTH"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#Sun Nov 19 15:47:56 CET 2023
|
||||
#Tue Jul 25 01:22:57 CEST 2023
|
||||
MAJOR=3
|
||||
MINOR=13
|
||||
PATCH=0
|
||||
MINOR=12
|
||||
PATCH=1
|
||||
PRE_RELEASE=
|
||||
BUILD=-1
|
||||
BUILD=0
|
||||
CODE=1
|
||||
|
|
Loading…
Reference in a new issue