Skip to content

Commit a1dc890

Browse files
authored
Merge pull request #584 from IntelligenceModding/dev/1.20.4
Port to 1.20.4 Neoforge
2 parents eb35cd2 + e524e84 commit a1dc890

222 files changed

Lines changed: 2679 additions & 3424 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug Report
22
description: Report bugs and problems
33
labels: ["bug", "needs review"]
4-
projects: ["IntelligenceModding/2"]
4+
projects: "IntelligenceModding/2"
55
body:
66
- type: markdown
77
attributes:
@@ -41,14 +41,14 @@ body:
4141
multiple: false
4242
options:
4343
- Own compiled build.
44-
- 1.20.1-0.7.38r (Latest 1.20.1)
45-
- 1.20.1-0.7.37r
46-
- 1.20.1-0.7.36r
47-
- 1.20.1-0.7.35b
48-
- 1.19.2-0.7.34r (Latest 1.19.2)
49-
- 1.19.2-0.7.33r
50-
- 1.19.2-0.7.32r
51-
- 1.19.2-0.7.31r
44+
- 1.20.1-0.7.41r (Latest 1.20.1)
45+
- 1.20.1-0.7.40r
46+
- 1.20.1-0.7.39r
47+
- 1.20.1-0.7.38r
48+
- 1.19.2-0.7.37r (Latest 1.19.2)
49+
- 1.19.2-0.7.36r
50+
- 1.19.2-0.7.35r
51+
- 1.19.2-0.7.34r
5252
- 1.18.2-0.7.31r (Latest 1.18.2)
5353
- 1.18.2-0.7.30r
5454
- 1.18.2-0.7.29r

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
* **Please check if the PR fulfills these requirements**
55
- [ ] The commit message are well described
6-
- [ ] Docs have been added / updated (for features or maybe bugs which were noted). If not, please update the needed documentation [here](https://github.com/SirEndii/Advanced-Peripherals-Documentation/pulls). This is not mandatory
6+
- [ ] Docs have been added / updated (for features or maybe bugs which were noted). If not, please update the needed documentation [here](https://github.com/SirEndii/Advanced-Peripherals-Documentation/pulls). Feel free to remove this check if you don't need it
77
- [ ] All changes have fully been tested
88

99
* **What kind of change does this PR introduce?** (Bug fix, feature, ...)
Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
name: build-and-test
2-
run-name: Build and test the changes
3-
on: [push, pull_request, workflow_dispatch]
1+
name: Build and Test
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
pull_request:
7+
types:
8+
- opened
9+
- synchronize
10+
411
jobs:
5-
test:
6-
name: Test
7-
runs-on: ubuntu-latest
8-
steps:
9-
- name: Checkout sources
10-
uses: actions/checkout@v4
11-
- name: Setup Gradle
12-
uses: gradle/gradle-build-action@v3
13-
- name: Build with Gradle
14-
run: ./gradlew check
15-
build:
16-
name: Build
17-
runs-on: ubuntu-latest
18-
needs: test
19-
steps:
20-
- name: Checkout sources
21-
uses: actions/checkout@v4
22-
- name: Setup Gradle
23-
uses: gradle/gradle-build-action@v3
24-
- name: Build with Gradle
25-
run: ./gradlew build
12+
build-and-test:
13+
uses: IntelligenceModding/actions/.github/workflows/build-and-test.yaml@master

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ build
1919

2020
# other
2121
eclipse
22-
run
22+
runs/
2323
server
24+
run
2425

2526
# Files from Forge MDK
2627
forge*changelog.txt

CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,56 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
9+
## [1.20.4-0.7.42a] - 2024-12-22
10+
11+
### Fixed
12+
- Fixed ME Bridge not connecting to AE2 grids
13+
- Fixed some recipes
14+
- Every energy, item or fluid interacting block should now work like the energy detector or some ME/RS functions
15+
- Fixed that the inventory manager would not open the screen
16+
17+
## [1.20.1-0.7.41r] - 2024-10-21
18+
19+
### Added
20+
- Wandering Trader config
21+
22+
### Changed
23+
- Save the owner of the memory card to the inventory manager after a player places the card into the manager and clear the card after. Resolves a security issue where players could eventually steal memory cards from other players
24+
25+
### Fixed
26+
- [#660] Fixed that the inventory manager's `getItemInHand` function adds a blank nbt tag to the item
27+
- [#636] Fixed that the automata's `useOnBlock` function will return PASS in some specific case
28+
- [#645] Fixed that the inventory functions for the powah integration would always return nil
29+
- Fixed that some entity operations don't have enough range
30+
- [#642] Fixed that some powah integrations clashes with the generic energy peripheral from CC which disables some functions
31+
- [#640] Fixed null pointer exception when invoking `getName`
32+
- [#662] Use tick time instead of epoch time for our chunk manager, fixes an issue where chunks unload if some ticks are skipped (lag)
33+
34+
## [1.20.1-0.7.40r] - 2024-06-11
35+
36+
### Added
37+
- [Features/#43] Up/down versions of automata block functions using pitch and yaw - Thanks to @zyxkad
38+
- [Features/#9] Added shift sneaking version of `useOnBlock` - Thanks to @zyxkad
39+
40+
### Fixed
41+
- [#582] Reworked the chunky turtle logic to fix several issues with them - Thanks to @zyxkad
42+
- Fixed a crash with the ME Bridge while trying to iterate through storage busses without a connected storage block
43+
- Fixed `isOnEnchantedSoil()` for the mana flower integration
44+
- [#419] Fixed that the automata `digBlock` function does not use breaking directions the right way. Fixes several issues with hammers or other AOE tools. - Thanks to @zyxkad
45+
- [#629] Fixed that placed blocks do not retain their custom block name when destroyed - Thanks to @WiggleWizzard
46+
- [#621] Fixed that the `listCells` function for the ME Bridge does not search in third party drives - Thanks to @michele-grifa
47+
- [#632] Fixed that the chat box allows sending chat messages with negative range - Thanks to @zyxkad
48+
- [#619] Fixed that the chat box can spoof people to click message to run danger commands - Thanks to @zyxkad
49+
- [#617] Fixed that sending invalid nbt data for some mod items through the chat box can cause a client crash - Thanks to @zyxkad
50+
- [#603] Fixed that the note block integration does not trigger allays - Thanks to @zyxkad
51+
- [#599] Fixed that turtle upgrades can't be equipped with custom NBT values - Thanks to @zyxkad
52+
- [#595] Fixed that `scanEntities` does not include living entity fields - Thanks to @zyxkad
53+
- [#581] Fixed concurrency issues with our server worker, fixes a crash when CC is set to use multiple threads - Thanks to @zyxkad
54+
55+
### Changed
56+
- [#588] Changed the misspelled `maxHealth` parameter in the player detector, the misspelled attribute is still included in the table for backwards compatibility - Thanks to @zyxkad
57+
- [#613] Clamp analog output of the `setAnalogOutput` function between 0-15 - Thanks to @zyxkad
58+
959
## [1.20.1-0.7.39r] - 2024-04-12
1060
### Fixed
1161
- [#578] Re-Added botania integration with a few new functions

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ will close pull requests related to translations.
6565
<!----------------------------------------------------------------------------->
6666

6767
[Documentation]: https://advancedperipherals.madefor.cc/
68-
[Contributors]: https://github.com/Seniorendi/AdvancedPeripherals/graphs/contributors
68+
[Contributors]: https://github.com/IntelligenceModding/AdvancedPeripherals/graphs/contributors
6969
[CurseForge]: https://www.curseforge.com/minecraft/mc-mods/advanced-peripherals
70-
[Actions]: https://github.com/Seniorendi/AdvancedPeripherals/actions
70+
[Actions]: https://github.com/IntelligenceModding/AdvancedPeripherals/actions
7171
[Crowdin]: https://crowdin.com/project/advanced-peripherals
7272
[Discord]: https://discord.intelligence-modding.de
7373
[Banner]: https://www.bisecthosting.com/images/CF/Advanced_Peripherals/BH_AP_Header.png 'Advanced Peripherals'
@@ -77,7 +77,7 @@ will close pull requests related to translations.
7777

7878
[@FatalMerlin]: https://github.com/FatalMerlin
7979
[@SirEdvin]: https://github.com/SirEdvin
80-
[@Srendi]: https://github.com/Seniorendi
80+
[@Srendi]: https://github.com/IntelligenceModding
8181
[@Olfi01]: https://github.com/Olfi01
8282

8383
[License]: LICENSE

0 commit comments

Comments
 (0)