Skip to content

Commit

Permalink
Merge https://github.com/Creators-of-Create/Create into mc1.15/experi…
Browse files Browse the repository at this point in the history 
…mental-rendering
  • Loading branch information
@LordGrimmauld
LordGrimmauld committed Jan 13, 2021
2 parents 2b615b6 + de55778 commit 07b33b6
Show file tree
Hide file tree
Showing 22 changed files with 1,273 additions and 848 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# mod version info
mod_version=0.3c
mod_version=0.3d
minecraft_version=1.15.2
forge_version=31.2.47

# dependency versions
registrate_version=0.0.4.18
registrate_version=1.0.0-rc.17
jei_version=6.0.0.2

# curseforge information
Expand Down
26 changes: 13 additions & 13 deletions src/generated/resources/.cache/cache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
499aade14db59f62b46e8a266998feb41e1922a1 assets/create/blockstates/fluid_pipe.json
4c3e0500f9382d2e426e823fe876f57f4d7ee3b4 assets/create/blockstates/fluid_pipe.json
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
Expand Down Expand Up @@ -335,7 +335,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
9e7ea57c58889fa0021e3c4f19da3f763108399f assets/create/blockstates/radial_chassis.json
89b63c6e5875da07226854651079bcea85439f5b assets/create/blockstates/radial_chassis.json
45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
Expand Down Expand Up @@ -397,17 +397,17 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
ff5ca8ad030f1dd58a05c2fef2c3788292db5bd1 assets/create/lang/en_ud.json
73018587da0c54d9e99a18649c2362d2710e23b2 assets/create/lang/en_us.json
0c0bc1299211f3d16ff69da4fd33a34ccb0a6b16 assets/create/lang/unfinished/de_de.json
14bb39c5cbdd8c7522f6e1736aefe8a8bc293aec assets/create/lang/unfinished/fr_fr.json
da4442fd0d7a69396a38050d22b8a4dca24cf7c8 assets/create/lang/unfinished/it_it.json
818528da9f50888744692d263f8996a41a3539e3 assets/create/lang/unfinished/ja_jp.json
0e1f1922cc50cce5839b3bf71f32750ac605a578 assets/create/lang/unfinished/ko_kr.json
4b8198d61f4fcf384d3e6dc5188846f0a3cc3d27 assets/create/lang/unfinished/nl_nl.json
7ec32d73f5ab8fc79b19e39da587cce1458d484e assets/create/lang/unfinished/pt_br.json
6d9fa6c52474894a65a49ea25afb39a27919deec assets/create/lang/unfinished/ru_ru.json
2c86a2f313e2650ec02c8368b1ea728a65fbc530 assets/create/lang/unfinished/zh_cn.json
f11f6bc6d9284f3b995e5d250745d0a1194bc695 assets/create/lang/en_ud.json
c7ce8fb0347cc524b4497a2c251122744d66c867 assets/create/lang/en_us.json
0ded0dcda370475b7e5398da8b18a0854a4465bb assets/create/lang/unfinished/de_de.json
3b023d30bf50b7b81be0394aab9f564d54ffc1b5 assets/create/lang/unfinished/fr_fr.json
9186e35869c87606b15057e854796f3556bf8a9b assets/create/lang/unfinished/it_it.json
9abc5a7129adfcb2492b7ba10afc64d77df4397e assets/create/lang/unfinished/ja_jp.json
3e2dc7dbc703826c87efe2c340c41a14c9c400c8 assets/create/lang/unfinished/ko_kr.json
26c3e64daddecf240ace2567d79a65e93c9c960f assets/create/lang/unfinished/nl_nl.json
76f2feec509e87e0819db706b344e7e87e7b4b99 assets/create/lang/unfinished/pt_br.json
079f2c1699d4b7280e028acb51d4b6a7eca10a03 assets/create/lang/unfinished/ru_ru.json
289f948c1f44a58fd454b356a6141561e5dcf024 assets/create/lang/unfinished/zh_cn.json
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json
Expand Down
110 changes: 55 additions & 55 deletions src/generated/resources/assets/create/blockstates/fluid_pipe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "true",
"down": "false",
"up": "true"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_x"
Expand All @@ -72,9 +72,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "true",
"down": "false",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_x"
Expand All @@ -83,9 +83,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "false",
"down": "true",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_x"
Expand All @@ -94,9 +94,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "false",
"down": "true",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_x"
Expand All @@ -105,9 +105,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "true",
"down": "true",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
Expand All @@ -116,9 +116,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "true",
"down": "false",
"up": "true"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
Expand All @@ -127,9 +127,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "false",
"down": "true",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
Expand All @@ -138,9 +138,9 @@
{
"when": {
"south": "true",
"north": "true",
"up": "false",
"down": "false",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
Expand All @@ -149,9 +149,9 @@
{
"when": {
"south": "false",
"north": "true",
"up": "false",
"down": "false",
"up": "false"
"north": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
Expand All @@ -160,9 +160,9 @@
{
"when": {
"south": "true",
"north": "false",
"up": "false",
"down": "false",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
Expand All @@ -171,9 +171,9 @@
{
"when": {
"south": "false",
"north": "false",
"up": "false",
"down": "false",
"up": "false"
"north": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_x"
Expand Down Expand Up @@ -302,120 +302,120 @@
},
{
"when": {
"west": "false",
"east": "true",
"up": "true",
"down": "false",
"up": "true"
"west": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_z"
}
},
{
"when": {
"west": "true",
"east": "false",
"up": "true",
"down": "false",
"up": "true"
"west": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ru_z"
}
},
{
"when": {
"west": "false",
"east": "true",
"up": "false",
"down": "true",
"up": "false"
"west": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ld_z"
}
},
{
"when": {
"west": "true",
"east": "false",
"up": "false",
"down": "true",
"up": "false"
"west": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_z"
}
},
{
"when": {
"west": "false",
"east": "false",
"up": "true",
"down": "true",
"up": "true"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"west": "false",
"east": "false",
"up": "true",
"down": "false",
"up": "true"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"west": "false",
"east": "false",
"up": "false",
"down": "true",
"up": "false"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_z"
}
},
{
"when": {
"west": "true",
"east": "true",
"up": "false",
"down": "false",
"up": "false"
"west": "true",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"west": "false",
"east": "true",
"up": "false",
"down": "false",
"up": "false"
"west": "false",
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"west": "true",
"east": "false",
"up": "false",
"down": "false",
"up": "false"
"west": "true",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_z"
}
},
{
"when": {
"west": "false",
"east": "false",
"up": "false",
"down": "false",
"up": "false"
"west": "false",
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_z"
Expand Down
Loading

0 comments on commit 07b33b6

Please sign in to comment.