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

1.20.1/dev #142

Merged
merged 4 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Java CI - Build on Push

on:
push:
branches: [ main, dev, "1.*" ]
branches: [ main, dev, "1.**" ]
workflow_dispatch:
inputs:
skip_maven_publish:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ 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).


## [2001.1.5]

### Changed
* Minor background change for compatibility with future FTB Library release
* No player-visible change, but will avoid problems with uncloseable config screens with next FTB Library

## [2001.1.4]

### Added
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ allprojects {
}

repositories {
mavenLocal()
maven {
url "https://maven.architectury.dev/"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import dev.architectury.event.events.client.ClientRawInputEvent;
import dev.architectury.event.events.client.ClientTickEvent;
import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
import dev.ftb.mods.ftblibrary.config.ConfigGroup;
import dev.ftb.mods.ftblibrary.config.ui.EditConfigScreen;
import dev.ftb.mods.ftbultimine.CooldownTracker;
import dev.ftb.mods.ftbultimine.FTBUltimine;
Expand Down Expand Up @@ -96,11 +97,10 @@ public void setShape(int shapeIdx, List<BlockPos> blocks) {

@Override
public void editConfig(boolean isClientConfig) {
if (isClientConfig) {
new EditConfigScreen(FTBUltimineClientConfig.getConfigGroup()).openGui();
} else {
new EditConfigScreen(FTBUltimineServerConfig.getConfigGroup()).openGui();
}
ConfigGroup configGroup = isClientConfig ?
FTBUltimineClientConfig.getConfigGroup() :
FTBUltimineServerConfig.getConfigGroup();
new EditConfigScreen(configGroup).setAutoclose(true).openGui();
}

public void renderInGame(PoseStack stack) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=2001.1.4
mod_version=2001.1.5
maven_group=dev.ftb.mods
mod_id=ftbultimine
archives_base_name=ftb-ultimine
Expand Down
Loading