JozsefA
24ab4e181f
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering
...
# Conflicts:
# src/main/java/com/simibubi/create/CreateClient.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/resources/META-INF/accesstransformer.cfg
2021-02-17 14:06:13 -08:00
Franco Paladini
22c03c4a14
Update es_es.json
...
accents suppressed
2021-02-17 16:56:09 -03:00
Franco Paladini
9048442fec
Update es_es.json
2021-02-17 16:52:50 -03:00
Franco Paladini
607ce9edca
Update es_es.json
2021-02-17 16:43:06 -03:00
Franco Paladini
9d57a25104
Update es_es.json
2021-02-17 16:42:37 -03:00
Franco Paladini
bd49e9bc7f
Update es_es.json
2021-02-17 16:39:07 -03:00
Franco Paladini
2f9607a196
Update es_es.json
2021-02-17 16:29:35 -03:00
Franco Paladini
d187dc0b38
Update es_es.json
2021-02-17 14:50:28 -03:00
Zelophed
159e298e8b
paletted contraptions
...
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
2021-02-17 17:21:31 +01:00
Franco Paladini
a4c96be51c
Update es_es.json
2021-02-17 08:24:41 -03:00
Franco Paladini
36553c6ee0
Update es_es.json
2021-02-17 01:01:01 -03:00
Franco Paladini
c4c57c6ba1
Update es_es.json
2021-02-16 23:41:47 -03:00
Franco Paladini
ed04fd1d52
Update es_es.json
2021-02-16 19:54:49 -03:00
JozsefA
d2e30eeab5
finish merge
...
remove old assets
2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d
Assisted Placement, Part IV-b
2021-02-16 22:50:11 +01:00
c6f82bff5e
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-16 20:29:40 +01:00
08562d2689
preliminary merge
2021-02-16 20:21:42 +01:00
simibubi
fd99acc00a
Merge branch 'mc1.15/dev' into mc1.15/ponder-ui
2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c
Ponder
...
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
2021-02-16 19:35:26 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished)
2021-02-16 13:59:05 -03:00
JozsefA
15302495f5
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
...
# Conflicts:
# src/main/java/com/simibubi/create/AllEntityTypes.java
# src/main/java/com/simibubi/create/AllSpriteShifts.java
# src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
# src/main/java/com/simibubi/create/foundation/command/AllCommands.java
# src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
JozsefA
1e95fe4c7b
avoid floating point accuracy errors at high coordinate values.
...
refactor contraption model translation to be a method in AbstractContraptionEntity.
- this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
JozsefA
67408e0dff
better vertex attributes.
...
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
82e922032a
Merge branch 'mc1.15/feedback2' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8
Player Feedback, Part II
2021-02-11 17:47:55 +01:00
muffinbarde
5f6c94939c
Update de_de.json
2021-02-11 17:21:05 +01:00
JozsefA
e93562569b
world fog works, fluid fog still doesn't.
...
better dimension changes.
2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90
Localize Fixes
2021-02-10 13:07:41 +09:00
JozsefA
0cb9094913
non experimental contraption rendering is back.
...
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.
maybe fix belt lighting, again.
remove old belt assets.
2021-02-09 16:14:44 -08:00
Chexet48
05e62ced51
Update it_it.json
2021-02-07 22:51:43 +01:00
simibubi
2700832dff
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-06 21:41:02 +01:00
Nick Smit
44a3313c12
Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue.
2021-02-06 21:07:24 +01:00
Chexet48
83df83d4be
Update it_it.json
...
Added Gantry Pinion and Gantry Shaft, missing in unlocalized entries
2021-02-06 19:09:29 +01:00
Odin
577c0e4912
Update fr_fr.json
...
666 Unlocalized
2021-02-06 17:34:37 +01:00
JozsefA
5ba4477ada
restore old tile rendering from 3336778052
2021-02-06 02:26:56 -08:00
3d2edc492b
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-05 21:36:10 +01:00
simibubi
ff96e80d81
ru_ru.json
...
- Integrated changes to russian localization made by #819 on correct branch to the correct file
2021-02-05 20:31:49 +01:00
simibubi
b3ee203701
fr_fr.json
...
- Reorganize localization file
2021-02-05 20:11:52 +01:00
simibubi
4a357bb729
Merge pull request #1027 from dindin-glitch/patch-2
...
Translated a bunch of random things
2021-02-05 20:05:42 +01:00
simibubi
16e871feba
it_it.json
...
- Move lang file to correct location
2021-02-05 20:02:39 +01:00
simibubi
df6b92cf19
Merge pull request #985 from dunois2737/mc1.15/dev
...
Create zh_tw.json
2021-02-05 19:52:19 +01:00
simibubi
58d2171f02
Merge pull request #896 from LWHK/mc1.15/dev
...
[Localization]update CHS translation
2021-02-05 19:45:47 +01:00
simibubi
a5f5204019
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-02-05 19:14:26 +01:00
simibubi
edf654cd4a
ja_jp.json
...
- Integrate changes to japanese localization from #879 in the correct file
2021-02-05 19:14:06 +01:00
Odin
ef3d4df944
Translated a bunch of random things
2021-02-05 18:59:58 +01:00
simibubi
2a035a7636
Merge pull request #749 from Chubzik1/patch-1
...
Small fix for an incorrectly translated line
2021-02-05 18:51:15 +01:00
simibubi
078d86de66
en_mx.json
...
- Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed
2021-02-05 18:42:08 +01:00
simibubi
d24851157e
Integrate recent changes to de_de.json
...
- Transfer changes made to the template file in #647 , #648 , #523 to actual lang file
2021-02-05 18:11:18 +01:00
simibubi
66b83c1250
Update Localization Readme.txt
2021-02-05 17:48:41 +01:00
simibubi
72ec08ddfa
Asset attack
...
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
2021-02-04 23:46:59 +01:00
simibubi
374f3c9547
Climb or Convey
...
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
2021-02-04 21:02:30 +01:00
dunois2737
490c53006f
Add files via upload
2021-02-04 21:41:48 +09:00
JozsefA
8c0e983f36
An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work.
...
Objective was GL compatibility, now runs with 3.3, 2.0 is target.
Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.
2021-02-03 23:21:10 -08:00
JozsefA
b766658415
probably fix all issues with ghost instances
...
instanced tiles on contraptions now self light properly
2021-02-02 13:11:22 -08:00
JozsefA
16b8e1175e
contraptions self light but man it is slow
...
optimization in PlacementSimulationWorld.getBlockState
2021-01-30 15:00:26 -08:00
TUsama
3ad62d2455
change some details
2021-01-30 12:24:16 +08:00
JozsefA
751fc7192d
fix rotating stuff on contraptions
2021-01-28 23:59:58 -08:00
JozsefA
67d59540cf
THIS IS NOT READY FOR USE
...
new rendering api/pipeline
not everything is there yet, but a lot is
2021-01-26 19:45:13 -08:00
TUsama
a03daa1aed
sync to latest version
2021-01-25 13:04:02 +08:00
TUsama
0f3c8fe699
update CHS translation
...
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
2021-01-25 12:40:52 +08:00
JozsefA
55ea7e3e55
cart contraptions are lit
2021-01-23 21:02:11 -08:00
Jozsef
4cbea0f9c9
intel graphics now like the shaders
2021-01-23 15:32:17 -08:00
simibubi
d35bdab51a
The return of dyed belts
...
- Dyes can now be used to change the appearance of Mechanical Belts
- Fluid items containing water can be used to clean dyed belts
2021-01-23 23:00:27 +01:00
JozsefA
83cb735e62
actors render correctly
2021-01-23 12:49:33 -08:00
JozsefA
cfd60fbc8d
fast actor rendering but it's not correct yet
2021-01-22 18:00:14 -08:00
fbb1c6b221
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
2021-01-22 20:56:46 +01:00
simibubi
525fc03278
Demise of the hopper funnel
...
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
2021-01-22 20:43:59 +01:00
JozsefA
11f9c7459c
prepare for fast actor rendering
2021-01-21 14:14:20 -08:00
JozsefA
697a7df59c
suddenly and magically, contraption rendering is 100% accurate
2021-01-21 12:26:55 -08:00
28cd9a1fe1
Druidcraft woodcutter compatibility
2021-01-20 22:36:04 +01:00
JozsefA
22a90c8e5d
on our way to super fancy contraption lighting
2021-01-17 22:18:31 -08:00
JozsefA
37e64e4c1d
fix vertex attribute data types
...
blockcolors and ao now work in contraptions
be smarter about allocating buffers
use gl buffer mapping, more to come
2021-01-15 16:17:13 -08:00
Chubz
645d28ac31
Small fix for an incorrectly translated line
...
Everyone makes mistakes, right?
2021-01-15 21:24:33 +04:00
JozsefA
0bc6b11c5b
be smart about rebuilding things
...
not smart enough about contraptions yet
things mostly render in the correct layers
2021-01-14 14:00:20 -08:00
07b33b66cc
Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering
2021-01-13 16:34:45 +01:00
simibubi
db3a579b21
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-01-13 15:11:58 +01:00
JozsefA
0ec312340f
rainbow debugging and almost correct tints for contraptions
2021-01-12 01:56:30 -08:00
Chubz
b1ac81611c
Update and fixes for ru_ru.json
...
Updated translation to match latest Create version, with some fixes and improvements for the existing lines
2021-01-11 20:43:13 +04:00
JozsefA
379ff9302b
rotating stuff renders too now
2021-01-11 01:04:18 -08:00
JozsefA
a56d08b78e
a bunch of refactoring to make things easier later
...
it's not any more stable but belts render on contraptions
rotating things almost do
actually fix a bunch of memory leaks
2021-01-11 00:29:02 -08:00
JozsefA
876ddde660
correct contraption lighting
2021-01-09 16:34:22 -08:00
JozsefA
7443ac5031
start fixing structure tint
2021-01-08 14:53:22 -08:00
JozsefA
05ab482f70
almost super fast kinetic rendering but we need to detect changes in light first (forge pr?)
...
fast contraption rendering
2021-01-08 01:29:18 -08:00
JozsefA
fa1e3ea543
solve lighting
2021-01-07 18:31:46 -08:00
JozsefA
7beeec5e00
maybe lighting is done
...
starting fast contraption rendering, not safe to use yet
2021-01-07 02:06:40 -08:00
JozsefA
91069163f8
clean shader code
2021-01-05 14:50:36 -08:00
JozsefA
c9feda18d6
add missing texture
2021-01-05 13:40:04 -08:00
JozsefA
566a370e3b
smooth belts
2021-01-05 13:29:45 -08:00
JozsefA
102e392ab4
merge experimental rendering from 1.16 to 1.15 part II
2021-01-05 10:58:31 +01:00
JozsefA
7d43bb056a
merge experimental rendering from 1.16 to 1.15
2021-01-05 10:56:47 +01:00
simibubi
bf73a24401
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-01-04 14:15:53 +01:00
simibubi
3cdbf47cb9
Adjusted Tooltips
2021-01-04 02:49:47 +01:00
simibubi
1498cb1cfc
Why are we still here, Part IV
...
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
simibubi
2699201661
Merge pull request #593 from Snownee/mc1.15/dev
...
Bug fixes
2020-12-27 13:25:54 +01:00
simibubi
27e12e6568
Merge pull request #525 from qkrehf2/patch-1
...
Update ko_kr.json
2020-12-27 13:24:24 +01:00
TUsama
111b63a3c7
0.3 CHS translation
...
Co-Authored-By: gloomybanana <29054038+gloomybanana@users.noreply.github.com>
Co-Authored-By: Snownee <16059084+Snownee@users.noreply.github.com>
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
Co-Authored-By: StarFish <56152035+Imbarainbow@users.noreply.github.com>
2020-12-25 22:41:51 +08:00
qkrehf2
388b3d9076
Nevermine the past fix. This is the right one
2020-12-25 18:11:54 +09:00
qkrehf2
bc74108933
Fixed Typo Ko_Kr
...
I was busy for holidays,, so now I can fix translation
2020-12-25 18:03:02 +09:00
Snownee
e554c5a3ff
Solution to #571
2020-12-25 16:06:32 +08:00
simibubi
c3c834bd2b
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-22 13:31:14 +01:00
0fe8a24041
Controlling the Assembler
2020-12-21 13:03:16 +01:00
qkrehf2
eafd1e9169
Deleted duplicated words
2020-12-20 01:22:33 +09:00
qkrehf2
efe01af06b
Fixed syntax error + {
2020-12-20 00:39:03 +09:00
simibubi
164dae700d
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-19 13:25:38 +01:00
simibubi
e2437d1a5c
Bug Fixes
...
- Fixed hose pulley not placing source blocks when filling with chocolate or honey
- Added a fluid tag to prevent bottomless draining behaviour of hose pulleys
- Grindstones can now be moved on contraptions
- Fixed fluids zFighting the item drain
- Added some crash safety for coupling rendering
- Updated mixer tooltip
2020-12-19 13:06:09 +01:00
qkrehf2
d4196df040
Translation Final
...
yay 0.3 updates
2020-12-19 12:24:24 +09:00
simibubi
ecd5858ece
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-18 18:36:51 +01:00
qkrehf2
5dedaebc2e
Update ko_kr.json
...
yummy translation
2020-12-18 23:53:01 +09:00
simibubi
6c6760ef17
More content, who dis?
...
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
2020-12-18 15:13:57 +01:00
qkrehf2
b47ff875a3
Update ko_kr.json
2020-12-18 12:44:13 +09:00
simibubi
6660718aff
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-17 23:32:11 +01:00
Daniel Amberson
493cad13d0
i am Indecisive
...
yea
* brass block got a texture that isn't garbage
* added a prototype brass block that might get used later
2020-12-17 15:32:52 -06:00
qkrehf2
814c13a8cd
Update ko_kr.json
...
advancement translation
2020-12-16 15:21:59 +09:00
simibubi
67cb69aaea
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-15 23:21:52 +01:00
simibubi
1840b40e2e
Advancing toward the day
...
- Added advancements for exploring the content
- Adjusted some recipes
2020-12-15 21:16:17 +01:00
qkrehf2
144005059c
Moreee Updates for KR
2020-12-14 17:27:31 +09:00
simibubi
78036195ab
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a
Fun with Recipes
...
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
Snownee
a845a70885
Material checklist I18n
2020-12-13 19:56:49 +08:00
qkrehf2
6bdaa3d3e8
Update ko_kr.json
2020-12-12 23:46:16 +09:00
simibubi
42215b8eb0
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-11 21:23:31 +01:00
simibubi
2744cabf14
How to 0.3
...
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
2020-12-11 19:36:13 +01:00
simibubi
afa477d81b
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-09 21:00:06 +01:00
simibubi
f4961e5ede
The polish continues
...
- Fixed water bottles able to be gather by clicking honey or chocolate fluids
- Fixed deployer not parting with its excess items
- Added hint message for backed up deployers
- Fixed basin spoutputs appearing on blocked faces
2020-12-09 18:45:47 +01:00
qkrehf2
d9a6e23719
Updating for better translation
...
12/09
2020-12-09 15:37:36 +09:00
4de7c118f4
merge and port. I WANT IT NOOOOW!
2020-12-05 11:42:14 +01:00
qkrehf2
7fb89c36fa
Update ko_kr.json
2020-12-05 13:33:42 +09:00
qkrehf2
b846695730
Update ko_kr.json
2020-12-05 12:54:58 +09:00
simibubi
3301f8ff01
Honey, I'm blue!
...
- Evade fluid tinting issues with optifine
2020-12-04 23:31:12 +01:00
simibubi
9e4b92babf
Other options are available
...
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
simibubi
2a56bb76be
Casing case closed, Part II
...
- Encasing fluid pipes now locks their configuration
- Encased fluid pipes now join textures with adjacent casing blocks
- Fixed windowed pipe not allowing to be encased
- Fixed wrapped models not passing down model data in multi layered situations
2020-12-03 23:49:12 +01:00
simibubi
16705c5cb5
A flock of fluids
...
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +01:00
simibubi
e3bef624a0
Casing case closed
...
- Encased shafts and gearboxes can now join textures with respective casing blocks
- Added back encased shaft items for creative mode
- Fixed encased shafts able to be created with casing and cogs
2020-12-02 21:49:57 +01:00
Daniel Amberson
da5ae87bec
contrast? in my copper???
...
it's more likely than you think!
2020-11-30 10:53:12 -06:00
simibubi
ccae111ec8
Reversing the reversed
...
- Controller rails can now control furnace minecarts
- Controller rails now snap to adjacent rails with the correct facing
- Controller rails no longer get reversed when transitioning to or from a slope in certain orientations
- Controller rails are now craftable
- Fun refactors
- Updated texture
- Recipe adjustments
2020-11-30 15:23:37 +01:00
Zelophed
a760ff8a79
Tinted Love
...
- apply redstone's block coloring to the controller rail
- add a little more polish to the piston pole placement helper
- textures at create:block/controller_rail_on and _off are currently unused, _analog is used for item only i think
2020-11-30 12:29:50 +01:00
59e377c7ef
merge recent changes
2020-11-30 09:48:38 +01:00
tterrag
696393ec41
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/generated/resources/assets/create/lang/unfinished/ru_ru.json
# src/generated/resources/assets/create/lang/unfinished/zh_cn.json
# src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
# src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
# src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
0231b32866
Someone get those damn mine carts under control!!
2020-11-28 21:12:31 +01:00
Kryppers
4d564464c5
Cu Later!
...
Updated copper oxidisation.
2020-11-27 22:39:06 +00:00
Daniel Amberson
b24648b431
i foRGOT ONE
...
A
2020-11-27 10:48:38 -06:00
simibubi
e7a22c96e9
Funnels for everybody
...
- Fixed flapfunnels not taking secondary items off depots
- Funnels can now sit horizontally on saws and drains
- Added a recipe from natural to regular scoria
2020-11-27 17:19:11 +01:00
simibubi
bbe0914b2f
SU to confuse you
...
- Reworked some of the tooltips presented by kinetic components
2020-11-27 13:31:55 +01:00
simibubi
b2e74463e3
All your basin are output to us
...
- Added useful goggle information to chutes
- (0.3.0) Chutes can no longer carry a fan-like air stream
- Fixed chutes overwriting contained items when picking them up from below
- Basins can now push outputs to any open inventory
- Basin output can now be controlled using a wrench
2020-11-27 01:37:22 +01:00
simibubi
e8edbcdb11
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-11-26 00:57:29 +01:00
simibubi
0b24523b8c
Get to the copper!
...
- Some asset rewiring
2020-11-26 00:17:49 +01:00
Daniel Amberson
b774956491
windows to hell
...
frick
2020-11-25 16:18:40 -06:00
Daniel Amberson
73e7df4227
"but the copper doesn't look minecraft-y enough!!"
...
yeah??
here you go, shush
2020-11-25 16:13:45 -06:00
simibubi
8ff98dc3fb
Fluid Delivery
...
- Fluid Tanks and Creative Fluid Tanks now form a combined fluid inventory on contraptions
- Added the Portable Fluid Interface
- Fixed tanks placed with nbt not clamping their contained fluids
- Item Storage information on Contraptions no longer get sent to the client
- Combined fluid storage synchronizes to the client and applies new contents to the corresponding mounted TE renderers
- Fixed motion of dripping potion particles from fluid pipe flow indication
- Portable Storage interfaces now interrupt their connection when receiving redstone power
2020-11-25 18:54:59 +01:00
8dff92e0bf
Added chest minecart contraption item and wrenching of chest minecart contraptions
2020-11-17 14:35:07 +01:00
