Skip to content

Commit 3378cae

Browse files
hlysinehlysine
committed
Merge branch 'refs/heads/main' into mc1.19.2/main
# Conflicts: # gradle.properties # src/main/java/com/hlysine/create_connected/datagen/CCTagGen.java # src/main/java/com/hlysine/create_connected/datagen/recipes/ItemApplicationRecipeGen.java # src/main/resources/create_connected.mixins.json
2 parents e57cd93 + f9820c4 commit 3378cae

File tree

248 files changed

+13962
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+13962
-67
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.8.0 - 2024-05-29
9+
10+
### Added
11+
12+
- **Fluid Vessel - Horizontal Fluid Tank**
13+
- A horizontal variant of the Fluid Tank
14+
- Can be turned into a boiler with reduced efficiency (efficiency is configurable)
15+
- Cycle through multiple window shapes using a Wrench
16+
- Small and Large Crank Wheels
17+
- Hand Crank + Cogwheels = Crank Wheels
18+
- Fan Freezing Catalyst
19+
- Works with bulk freezing in Create: Garnished and Create: Dreams & Desires
20+
- New translations and new languages (thanks [Crowdin contributors](https://crowdin.com/project/create-connected-mod/reports/top-members)!)
21+
22+
### Fixed
23+
24+
- A startup crash due to incompatibility when item attributes are accessed too early (#62)
25+
- Missing particles for Linked Transmitters (#58)
26+
- Linked Transmitters being interactable when in spectator mode
27+
828
## 0.7.4 - 2024-03-21
929

1030
### Fixed

‎README.md

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,20 @@ out [Create: Power Loader](https://modrinth.com/mod/create-power-loader)**
1919

2020
> Join us in the [Create: Addon Hub](https://discord.gg/3AvrppcgG3) server for a chat!
2121
22-
## What's new in 0.7
22+
## What's new in 0.8
2323

24-
**Compatibility with Create: Copycats+**
24+
![fluid_vessel](https://github.com/hlysine/create_connected/assets/25472513/aeebc30a-ea8c-4aaa-b80c-36993ea7b5d5) ![creative_fluid_vessel](https://github.com/hlysine/create_connected/assets/25472513/80ad7d61-731e-494d-a334-d59215874aa3) **Fluid Vessel**
2525

26-
All copycats from Create: Connected, Create: More Copycats and Create: Copies and Cats are merged into the ultimate
27-
mod - [**Create: Copycats+**](https://modrinth.com/mod/copycats) !
26+
Horizontal fluid tanks with full support of all fluid tank features! Boilers made from fluid vessels are nerfed by
27+
default, but can be changed in the server config. You can also cycle through multiple window shapes using a wrench.
2828

29-
Copycats+ exclusive features include:
29+
![crank_wheel](https://github.com/hlysine/create_connected/assets/25472513/36c28f61-423b-493e-943b-534a4d4bcd39) ![large_crank_wheel](https://github.com/hlysine/create_connected/assets/25472513/c4b94676-4ec0-46de-8a15-317c1689aa57) **Small/Large Crank Wheels**
3030

31-
- Forge/**Fabric** 1.20.1/1.19.2/1.18.2 support
32-
- Even more copycats
33-
- Improved copycat model quality
34-
- Toggleable connected textures
31+
Hand cranks with built-in cogwheels. Useful in tight spaces and for gear ratios.
3532

36-
![Copycats+](https://cdn.modrinth.com/data/UT2M39wf/images/e20c128b7c0e000e904584811d20f753d846af80.png)
33+
![fan_freezing_catalyst](https://github.com/hlysine/create_connected/assets/25472513/f7e07503-f2ec-48d1-9fb1-d74e65253632) **Fan Freezing Catalyst**
3734

38-
All your existing C:Connected copycats will migrate seamlessly and progressively when you install Copycats+ and
39-
Connected side-by-side.
40-
Keep both mods installed to avoid data loss in existing worlds.
41-
42-
**Various bug fixes**
43-
44-
Multiple crashes have been fixed. If you've had issues with Create: Connected in your modpacks before, please try again
45-
with this new version.
35+
A new catalyst for bulk freezing. Works with Create: Garnished and Create: Dreams & Desires.
4636

4737
## Features
4838

‎build.gradle

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,29 @@ repositories {
161161
name = "ModMaven"
162162
url = "https://modmaven.dev"
163163
}
164-
maven {
165-
name = "Modrinth"
166-
url = "https://api.modrinth.com/maven"
164+
exclusiveContent {
165+
forRepository {
166+
maven {
167+
name = "Modrinth"
168+
url = "https://api.modrinth.com/maven"
169+
}
170+
}
171+
forRepositories(fg.repository)
172+
filter {
173+
includeGroup "maven.modrinth"
174+
}
175+
}
176+
exclusiveContent {
177+
forRepository {
178+
maven {
179+
name = "Curse Maven"
180+
url = "https://cursemaven.com"
181+
}
182+
}
183+
forRepositories(fg.repository)
184+
filter {
185+
includeGroup "curse.maven"
186+
}
167187
}
168188

169189
// If you have mod jar dependencies in ./libs, you can declare them as a repository like so.
@@ -202,6 +222,8 @@ dependencies {
202222
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
203223
// The group id is ignored when searching -- in this case, it is "blank"
204224
implementation fg.deobf("blank:copycats-${copycats_minecraft_version}:${copycats_version}")
225+
// implementation fg.deobf("maven.modrinth:create-garnished:${garnished_version}+${garnished_minecraft_version}")
226+
// implementation fg.deobf("maven.modrinth:create-dreams-and-desires:${dreams_desires_minecraft_version}-${dreams_desires_version}")
205227

206228
// For more info:
207229
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html

‎gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jei_version = 11.2.0.254
5151

5252
copycats_minecraft_version = 1.19.2
5353
copycats_version = 1.1.0
54+
garnished_minecraft_version = 1.19.2-forge
55+
garnished_version = 1.8
56+
dreams_desires_version = 0.1b.Release-Early-Dev
5457

5558
## Mod Properties
5659

@@ -62,7 +65,7 @@ mod_name=Create: Connected
6265
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
6366
mod_license=GNU Affero General Public License v3.0
6467
# The mod version. See https://semver.org/
65-
mod_version=0.7.4-mc1.19.2
68+
mod_version=0.8.0-mc1.19.2
6669
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
6770
# This should match the base package used for the mod sources.
6871
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

‎src/generated/resources/assets/create_connected/blockstates/crank_wheel.json

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
{
2+
"variants": {
3+
"axis=x,facing=down,waterlogged=false": {
4+
"model": "create_connected:block/crank_wheel/block",
5+
"x": 180
6+
},
7+
"axis=x,facing=down,waterlogged=true": {
8+
"model": "create_connected:block/crank_wheel/block",
9+
"x": 180
10+
},
11+
"axis=x,facing=east,waterlogged=false": {
12+
"model": "create_connected:block/crank_wheel/block",
13+
"x": 90,
14+
"y": 90
15+
},
16+
"axis=x,facing=east,waterlogged=true": {
17+
"model": "create_connected:block/crank_wheel/block",
18+
"x": 90,
19+
"y": 90
20+
},
21+
"axis=x,facing=north,waterlogged=false": {
22+
"model": "create_connected:block/crank_wheel/block",
23+
"x": 90
24+
},
25+
"axis=x,facing=north,waterlogged=true": {
26+
"model": "create_connected:block/crank_wheel/block",
27+
"x": 90
28+
},
29+
"axis=x,facing=south,waterlogged=false": {
30+
"model": "create_connected:block/crank_wheel/block",
31+
"x": 90,
32+
"y": 180
33+
},
34+
"axis=x,facing=south,waterlogged=true": {
35+
"model": "create_connected:block/crank_wheel/block",
36+
"x": 90,
37+
"y": 180
38+
},
39+
"axis=x,facing=up,waterlogged=false": {
40+
"model": "create_connected:block/crank_wheel/block"
41+
},
42+
"axis=x,facing=up,waterlogged=true": {
43+
"model": "create_connected:block/crank_wheel/block"
44+
},
45+
"axis=x,facing=west,waterlogged=false": {
46+
"model": "create_connected:block/crank_wheel/block",
47+
"x": 90,
48+
"y": 270
49+
},
50+
"axis=x,facing=west,waterlogged=true": {
51+
"model": "create_connected:block/crank_wheel/block",
52+
"x": 90,
53+
"y": 270
54+
},
55+
"axis=y,facing=down,waterlogged=false": {
56+
"model": "create_connected:block/crank_wheel/block",
57+
"x": 180
58+
},
59+
"axis=y,facing=down,waterlogged=true": {
60+
"model": "create_connected:block/crank_wheel/block",
61+
"x": 180
62+
},
63+
"axis=y,facing=east,waterlogged=false": {
64+
"model": "create_connected:block/crank_wheel/block",
65+
"x": 90,
66+
"y": 90
67+
},
68+
"axis=y,facing=east,waterlogged=true": {
69+
"model": "create_connected:block/crank_wheel/block",
70+
"x": 90,
71+
"y": 90
72+
},
73+
"axis=y,facing=north,waterlogged=false": {
74+
"model": "create_connected:block/crank_wheel/block",
75+
"x": 90
76+
},
77+
"axis=y,facing=north,waterlogged=true": {
78+
"model": "create_connected:block/crank_wheel/block",
79+
"x": 90
80+
},
81+
"axis=y,facing=south,waterlogged=false": {
82+
"model": "create_connected:block/crank_wheel/block",
83+
"x": 90,
84+
"y": 180
85+
},
86+
"axis=y,facing=south,waterlogged=true": {
87+
"model": "create_connected:block/crank_wheel/block",
88+
"x": 90,
89+
"y": 180
90+
},
91+
"axis=y,facing=up,waterlogged=false": {
92+
"model": "create_connected:block/crank_wheel/block"
93+
},
94+
"axis=y,facing=up,waterlogged=true": {
95+
"model": "create_connected:block/crank_wheel/block"
96+
},
97+
"axis=y,facing=west,waterlogged=false": {
98+
"model": "create_connected:block/crank_wheel/block",
99+
"x": 90,
100+
"y": 270
101+
},
102+
"axis=y,facing=west,waterlogged=true": {
103+
"model": "create_connected:block/crank_wheel/block",
104+
"x": 90,
105+
"y": 270
106+
},
107+
"axis=z,facing=down,waterlogged=false": {
108+
"model": "create_connected:block/crank_wheel/block",
109+
"x": 180
110+
},
111+
"axis=z,facing=down,waterlogged=true": {
112+
"model": "create_connected:block/crank_wheel/block",
113+
"x": 180
114+
},
115+
"axis=z,facing=east,waterlogged=false": {
116+
"model": "create_connected:block/crank_wheel/block",
117+
"x": 90,
118+
"y": 90
119+
},
120+
"axis=z,facing=east,waterlogged=true": {
121+
"model": "create_connected:block/crank_wheel/block",
122+
"x": 90,
123+
"y": 90
124+
},
125+
"axis=z,facing=north,waterlogged=false": {
126+
"model": "create_connected:block/crank_wheel/block",
127+
"x": 90
128+
},
129+
"axis=z,facing=north,waterlogged=true": {
130+
"model": "create_connected:block/crank_wheel/block",
131+
"x": 90
132+
},
133+
"axis=z,facing=south,waterlogged=false": {
134+
"model": "create_connected:block/crank_wheel/block",
135+
"x": 90,
136+
"y": 180
137+
},
138+
"axis=z,facing=south,waterlogged=true": {
139+
"model": "create_connected:block/crank_wheel/block",
140+
"x": 90,
141+
"y": 180
142+
},
143+
"axis=z,facing=up,waterlogged=false": {
144+
"model": "create_connected:block/crank_wheel/block"
145+
},
146+
"axis=z,facing=up,waterlogged=true": {
147+
"model": "create_connected:block/crank_wheel/block"
148+
},
149+
"axis=z,facing=west,waterlogged=false": {
150+
"model": "create_connected:block/crank_wheel/block",
151+
"x": 90,
152+
"y": 270
153+
},
154+
"axis=z,facing=west,waterlogged=true": {
155+
"model": "create_connected:block/crank_wheel/block",
156+
"x": 90,
157+
"y": 270
158+
}
159+
}
160+
}

0 commit comments

Comments
 (0)