Skip to content

Commit

Permalink
Merge branch 'mc1.18/fabric/dev' into mc1.19/fabric/dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/simibubi/create/content/redstone/thresholdSwitch/ThresholdSwitchBlockEntity.java
  • Loading branch information
TropheusJ committed Nov 23, 2024
2 parents 25dabe1 + 1557bb0 commit 1e31af1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions FABRIC_CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Change logging starts below:
- Fix nonsense fluid unit option when display links measured items (#995)
- Fix copycat panels with framed glass not hiding faces when using sodium (#1540)
- Fix filtered Smart Observers stopping listing matching items after finding 1 non-matching item (#996)
- Fix incorrect capacities on large storages (#1633, #1637)
- Merge in 0.5.1.g/h (https://github.com/Creators-of-Create/Create/wiki/0.5.1g-&-h)
- Merge in 0.5.1.i (https://github.com/Creators-of-Create/Create/wiki/0.5.1i)
- Merge in 0.5.1.j (https://github.com/Creators-of-Create/Create/wiki/0.5.1j)
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,8 @@ public void updateCurrentLevel() {
} else {
invVersionTracker.awaitNewVersion(inv);
for (StorageView<ItemVariant> view : inv) {
// fabric: compat is unused, skip it
long space = Math.min(view.getResource().getItem().getMaxStackSize(), view.getCapacity());

// fabric: forge also checks for item max stack size, we should just trust capacity on fabric though.
long space = view.getCapacity();
long count = view.getAmount();
if (space == 0)
continue;
Expand Down

0 comments on commit 1e31af1

Please sign in to comment.