Skip to content

Commit fa1fe41

Browse files
committed
Merge branch 'release/1.21.1' into dev/1.21.1
2 parents bf4ad9b + fe3ef0f commit fa1fe41

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ mod_id=advancedperipherals
77
# do not include mod_version/minecraft_version with equals sign anywhere else in the file (even in comments)
88
# also do not add space around the equal sign
99
# since we are using poor grep command to do automation :p
10-
mod_version=0.7.51b
10+
mod_version=0.7.52b
1111
minecraft_version=1.21.1
1212
mod_artifact_suffix=
1313
neo_version=21.1.186
1414
parchment_minecraft_version=1.21.1
1515
parchment_mappings_version=2024.11.17
1616
loader_version=4
17-
release_type=alpha
17+
release_type=beta
1818
jb_annotations=21.0.1
1919

2020
# Test dependencies

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public final Object getRequests() throws LuaException {
276276
map.put("state", request.getState().toString());
277277
map.put("count", deliverableRequest.getCount());
278278
map.put("minCount", deliverableRequest.getMinimumCount());
279-
map.put("items", request.getDisplayStacks().stream().map(item -> LuaConverter.itemStackToObject(item, getLevel())).collect(Collectors.toList()));
279+
map.put("items", request.getDeliveries().stream().map(item -> LuaConverter.itemStackToObject(item, getLevel())).collect(Collectors.toList()));
280280
map.put("target", request.getRequester().getRequesterDisplayName(requestManager, request).getString());
281281
result.add(map);
282282
});

0 commit comments

Comments
 (0)