Merge branch 'development' into master

This commit is contained in:
Aurora 2020-08-13 20:11:51 +02:00
commit c2200fa559
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicEnchants</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>1.1.7</version>
<version>1.1.8</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>EpicEnchants-${project.version}</finalName>

View File

@ -61,7 +61,7 @@ public class ItemGroup {
for (int i = 0; i < 5; i++) {
getGroup(materials).ifPresent(group -> {
groups.add(group.getName());
materials.removeAll(getMaterials(group));
materials.removeAll(getMaterials(group).stream().map(e -> CompatibleMaterial.getMaterial(e)).collect(Collectors.toList()));
});
}