Merge pull request #754 from FTBTeam/dev

Dev
FTBTeam · Nov 7, 2024 · 9c7d1c7 · 9c7d1c7
2 parents 0e21d43 + e777df6
commit 9c7d1c7
Show file tree

Hide file tree

Showing 70 changed files with 554 additions and 469 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,8 +1,11 @@
 name: Java CI - Build Release
 
 on:
-  release:
-    types: [ published ]
+  push:
+    tags:
+      - 'v[0-9]+\.[0-9]+\.[0-9]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [2101.1.1]
+
+### Added
+* The pinned quests panel now has a "Pinned Quests" title for clarity
+* Added a feedback option for command reward
+  * In the case where running a command produces no obvious effect, this can help notify the player that something has happened
+
+### Changed
+* Overhauled and cleaned up many icon textures
+
+### Fixed
+* Fixed context menu tooltips sometimes appearing behind the context menu
+* Fixed some issues with the reward table editor GUI (changes not getting correctly sync'd to server in some cases)
+
 # [2101.1.0]
 
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,8 @@ plugins {
 	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
+apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'
+
 architectury {
 	minecraft = rootProject.minecraft_version
 }
@@ -13,6 +15,13 @@ subprojects {
 
 	loom {
 		silentMojangMappingsLicense()
+
+		runs {
+			client {
+				vmArgs "-Xmx4G"
+				programArgs "--width", "1920", "--height", "1080"
+			}
+		}
 	}
 
 	dependencies {
@@ -95,7 +104,7 @@ allprojects {
 
 publishMods {
 	dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
-	changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
+	changelog = createChangelog(project)
 	version = "${mod_version}"
 
 	// TODO: Migrate to something else

diff --git a/common/src/main/java/dev/ftb/mods/ftbquests/block/entity/LootCrateOpenerBlockEntity.java b/common/src/main/java/dev/ftb/mods/ftbquests/block/entity/LootCrateOpenerBlockEntity.java
@@ -126,7 +126,7 @@ protected ItemStack _insertItem(int slot, ItemStack stack, boolean simulate) {
             return stack;
         }
 
-        LootCrate crate = LootCrateItem.getCrate(stack);
+        LootCrate crate = LootCrateItem.getCrate(stack, false);
         if (crate == null) {
             return stack;
         }
@@ -160,7 +160,7 @@ protected ItemStack _insertItem(int slot, ItemStack stack, boolean simulate) {
     }
 
     protected boolean _isItemValid(int slot, ItemStack stack) {
-        return slot == 0 && LootCrateItem.getCrate(stack) != null;
+        return slot == 0 && LootCrateItem.getCrate(stack, level.isClientSide) != null;
     }
 
     protected ItemStack _extractItem(int slot, int amount, boolean simulate) {