mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.21.1/dev

Browse source 
# Conflicts:
#	src/main/java/com/simibubi/create/AllDisplaySources.java
This commit is contained in:
IThundxr 2025-03-02 10:17:44 -05:00
commit 1f306c3dc9
Failed to generate hash of commit
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
changelog.md
View file

@ -1,3 +1,11 @@
------------------------------------------------------
Create 6.0.2
------------------------------------------------------
#### Bug Fixes
- Fix warning getting logged when cc: tweaked isn't installed
------------------------------------------------------ ------------------------------------------------------
Create 6.0.1 Create 6.0.1
------------------------------------------------------ ------------------------------------------------------

3
src/main/java/com/simibubi/create/AllDisplaySources.java
View file

@ -88,6 +88,9 @@ public class AllDisplaySources {
public static final RegistryEntry<DisplaySource, ComputerDisplaySource> COMPUTER = REGISTRATE.displaySource("computer", ComputerDisplaySource::new) public static final RegistryEntry<DisplaySource, ComputerDisplaySource> COMPUTER = REGISTRATE.displaySource("computer", ComputerDisplaySource::new)
.onRegisterAfter(Registries.BLOCK_ENTITY_TYPE, source -> { .onRegisterAfter(Registries.BLOCK_ENTITY_TYPE, source -> {
if (!Mods.COMPUTERCRAFT.isLoaded())
return;
List<String> types = List.of("wired_modem_full", "computer_normal", "computer_advanced", "computer_command"); List<String> types = List.of("wired_modem_full", "computer_normal", "computer_advanced", "computer_command");
for (String name : types) { for (String name : types) {
ResourceLocation id = Mods.COMPUTERCRAFT.rl(name); ResourceLocation id = Mods.COMPUTERCRAFT.rl(name);