Merge remote-tracking branch 'origin/mc-1.18.x/stable' into mc-1.18.x/1.18.2
# Conflicts: # README.md
@ -16,7 +16,9 @@ This mod includes textures by [Jummit](https://github.com/Jummit) that are more
|
||||
<img src="https://raw.githubusercontent.com/cc-orgs/cc-overhaul/main/pack.png" alt="CC: Restitched" width="32" height="32"/> We also have a second resourcepack made by [3prm3](https://github.com/3prm3), it features a complete overhaul and can be enabled by enabling the `overhaul` resource pack, go check out his resource pack over [here](https://github.com/cc-orgs/cc-overhaul/tree/main)!
|
||||
|
||||
## Bleeding Edge Ver.
|
||||
Bleeding edge builds can be found [here](https://github.com/cc-tweaked/cc-restitched/actions) at Github Actions. In the .zip file there should be a "-dev" jar, a "-javadoc" jar, a "-sources-dev" jar, a "-sources" jar, and a plain (jar without an affixed tag) jar. Put the plain jar in the mods folder.
|
||||
Bleeding edge builds can be found [here](https://github.com/cc-tweaked/cc-restitched/actions) at Github Actions.
|
||||
In the .zip file there should be a `-dev` jar, a `-javadoc` jar, a `-sources-dev` jar, a `-sources` jar, and a "plain" jar (jar without an affixed tag) jar.
|
||||
Put the "plain" jar in the mods folder.
|
||||
|
||||
## Contributions
|
||||
Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC: R there are a few rules;
|
||||
|
BIN
doc/logo.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 866 B |
BIN
logo.png
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 2.6 KiB |
@ -111,7 +111,7 @@ public final class ComputerCraftAPI
|
||||
}
|
||||
|
||||
/**
|
||||
* rers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
|
||||
* Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
|
||||
*
|
||||
* @param provider The peripheral provider to register.
|
||||
* @see IPeripheral
|
||||
|
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 404 B |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 715 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 771 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 715 B |
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 412 B |
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 867 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 508 B After Width: | Height: | Size: 420 B |
@ -17,7 +17,8 @@
|
||||
"parly",
|
||||
"Merith.TK",
|
||||
"Jummit",
|
||||
"Toad-Dev"
|
||||
"Toad-Dev",
|
||||
"3prm3"
|
||||
],
|
||||
"depends": {
|
||||
"minecraft": ">=1.18.2-rc.1 <1.19",
|
||||
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 409 B |
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 429 B |
Before Width: | Height: | Size: 439 B After Width: | Height: | Size: 415 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 628 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 867 B |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 1.3 KiB |