Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Item_Model_Datagen' into Item_Mo…
Browse files Browse the repository at this point in the history
…del_Datagen

# Conflicts:
#	src/main/java/com/mraof/minestuck/data/MinestuckData.java
  • Loading branch information
SputterSizzle committed Jul 9, 2023
2 parents 4545aab + cae1a93 commit b91861c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/mraof/minestuck/data/MinestuckData.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public static void gatherData(GatherDataEvent event)

gen.addProvider(event.includeServer(), new StartingModusProvider(gen, Minestuck.MOD_ID));

gen.addProvider(event.includeClient(), new MinestuckBlockStateProvider(gen, fileHelper));
gen.addProvider(event.includeClient(), new MinestuckItemModelProvider(gen, fileHelper));
gen.addProvider(true, new MinestuckBlockStateProvider(gen, fileHelper));
gen.addProvider(true, new MinestuckItemModelProvider(gen, fileHelper));
gen.addProvider(event.includeClient(), new MinestuckEnUsLanguageProvider(gen));
}
}

0 comments on commit b91861c

Please sign in to comment.