Tags: wshellcry/OpenComputers
Tags
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput… …ers into OC1.5-MC1.7.10 Conflicts: src/main/resources/assets/opencomputers/lib/native.32.so src/main/resources/assets/opencomputers/lib/native.64.so
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput… …ers into OC1.5-MC1.7.10 Conflicts: build.properties src/main/resources/assets/opencomputers/lib/native.32.bsd.so src/main/resources/assets/opencomputers/lib/native.32.dll src/main/resources/assets/opencomputers/lib/native.32.dylib src/main/resources/assets/opencomputers/lib/native.32.so src/main/resources/assets/opencomputers/lib/native.64.dll src/main/resources/assets/opencomputers/lib/native.64.dylib src/main/resources/assets/opencomputers/lib/native.64.so
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComput… …ers into OC1.5-MC1.7.10
PreviousNext