Merge remote-tracking branch 'origin/Chemplant_New_Coils' into dev · GTNewHorizons/GTplusplus@17d6961 · GitHub

This repository has been archived by the owner on May 26, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/Chemplant_New_Coils' into dev

Browse files

# Conflicts:
#	src/main/resources/assets/miscutils/lang/en_US.lang

Loading branch information

Dream-Master committed Jun 9, 2022

2 parents 9c39793 + 8bbc8c7 commit 17d6961