simibubi
47bd1d9c93
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-04 00:58:14 +02:00
simibubi
62b1fe82b7
Fix-ups Cont'd
...
- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
2021-04-03 23:49:59 +02:00
simibubi
c7a3464151
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-02 22:27:37 +02:00
simibubi
7193b5b0c2
Merge pull request #1149 from RakuGaki-MC/mc1.16/dev
...
[mc1.16/dev] Update ja_jp.json
2021-04-02 21:00:07 +02:00
Christof
1d31271bcb
Update de_de.json
...
Typos and Gabelstein = Gabbro
2021-04-02 18:23:11 +02:00
Christof
8dbfd4877e
Update de_de.json
...
Added the translations for a lot of blocks and a few advancements
2021-04-02 18:07:53 +02:00
90b9a3aff9
Merge & Port
2021-03-29 10:57:50 +02:00
simibubi
5299204fb5
Better Tooltip Integration
...
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
caa3c57b71
Merge & Port
2021-03-28 10:58:25 +02:00
Kryppers
7de922f239
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-28 02:13:57 +01:00
Kryppers
1888f2d79b
Update weighted_ejector_casing.png
2021-03-28 02:13:53 +01:00
simibubi
76bd3b3f50
Pondering too fast
...
- Added a button to slow down ponder scenes while any text is shown on screen
2021-03-28 01:52:04 +01:00
Kryppers
213711ce77
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-27 21:09:19 +00:00
Kryppers
c239cec8b4
Update weighted_ejector_top.png
2021-03-27 21:09:17 +00:00
simibubi
3dd199e9d9
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-27 20:15:13 +01:00
simibubi
497ea4bb66
Foolish not to avoid the lack of counteracting no-clip
...
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
2021-03-27 20:14:55 +01:00
Kryppers
25bc102e92
New contact, who dis?
...
updated redstone contact textures.
2021-03-27 19:13:26 +00:00
fe10c258c4
Merge & Port
2021-03-26 23:13:49 +01:00
simibubi
cb759e793e
3D Printing is cool again
...
- Fixed Schematicannon clearing blocks outside of a Schematics' bounding box
- Safety check for onBlockPlacedBy with null player
- Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory
2021-03-26 22:05:16 +01:00
35c62360be
Merge & Port
2021-03-26 16:03:09 +01:00
9c8d035694
Dya see the dye?
2021-03-26 13:35:45 +01:00
simibubi
718142e26f
Faith in your Depot
...
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
2021-03-26 00:15:38 +01:00
cbbf502003
port recent changes
2021-03-24 14:54:24 +01:00
JozsefA
1310b88828
Lieutenant Scatterbrain II.
...
- Swich to tabs. (not everything is tabs yet)
- Refactor light and color attributes to their own Enum.
- Quaternion/pivot/position attribute shader.
- Always update an instance when the WorldRenderer checks if it should rerender a block.
- Simplify some names.
- Remove generics in InstanceData classes.
- Deployer Tiles now use the oriented material.
- Press heads now correctly orient themselves.
- ModelData buffers things faster and is simpler.
2021-03-22 20:20:52 -07:00
simibubi
f7f7b67a7d
Thinking Arms
...
- Ponder Scenes for the Mechanical Arm
- Fixed empty basins showing a fluid container tooltip
2021-03-22 02:05:47 +01:00
JozsefA
3d0898c59b
Smooth harvesters, step sounds v1.
2021-03-20 13:16:20 -07:00
zelophed
d03ea3488a
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/blockstates/andesite_funnel.json
# src/generated/resources/assets/create/blockstates/brass_funnel.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.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/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
# src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
# src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java
# src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java
# src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java
# src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
# src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java
# src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java
# src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
# src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java
# src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
# src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java
# src/main/java/com/simibubi/create/foundation/utility/Lang.java
# src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java
# src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
# src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
2021-03-20 12:58:02 +01:00
simibubi
c0de8c4eb6
The grind continues
...
- Scenes for Millstone, Crushing wheels, blaze burners, basin, mixer, press, speedometer and stressometer
2021-03-19 20:05:55 +01:00
JozsefA
b7ec884b9c
Includes, quaternions, and frames.
...
- Shaders can now reference other files with #flwinclude <"...">.
- Shaders are now located in assets/flywheel/shaders.
- Include paths are namespaced (a la ResourceLocation) and relative to the flywheel shaders root folder.
- Optimized glsl rotations using quaternions (when applicable) and vectorized matrix construction.
- Vectorize diffuse lighting calculations.
- Micro optimization in SmartTileEntity.java
2021-03-18 14:36:37 -07:00
JozsefA
20da7c7761
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-16 15:52:45 -07:00
JozsefA
018c177f1e
Better contraption actor instancing.
...
- Promoted actor instance creation to the ActorInstance class.
- Drills and Harvesters' rotational speed is based on their movement speed with Flywheel on.
- Deployers now use Flywheel.
2021-03-16 15:52:37 -07:00
simibubi
a897b5e78b
Scene machine
...
- Fix funnels not rendering filter slot items
- Ponder scenes for the Deployer, Harvester and Plough
- Fixed uvs on Deployer model
- Ploughs can now harvest snow layers
2021-03-16 21:04:42 +01:00
JozsefA
a1e10a5c3c
Belt speed = item speed and secret wrench fix.
2021-03-12 16:33:01 -08:00
Kryppers
5e5289fcb0
Update secondary_linear_chassis_side_connected.png
2021-03-11 23:50:58 +00:00
simibubi
2a8c3debeb
Captain Distracto, Part II
...
- Linear Chassis now connect to each other in any direction
2021-03-11 19:51:58 +01:00
simibubi
d1e96c3b4b
Timewarp
...
- Added user view mode for editors to hide coordinates
- Ponder now pauses the game in SP
- Ponder elements now use a separate timer and separate partial ticks
- Fixed virtual funnels not flapping
- Fixed ponder buttons having hover highlights when not clickable
- Fixed ponder button mouse hitbox
- Addressed strange render state bleed with identify mode highlighting
2021-03-11 11:35:34 +01:00
JozsefA
95eabe9cf9
Instanced arms.
2021-03-09 14:22:20 -08:00
simibubi
d61b840c5c
Back to fighting Minecarts
...
- Fixed Minecart Contraptions started on a powered rail facing in unwanted directions
- Fixed powered rail Cart Assemblers not respecting the solid block rule of powered rails
- Fixed Minecart contraption items not facing away from the player when placed
- Polished every last bit of the belt uvs
2021-03-09 04:24:45 +01:00
simibubi
62c3ae4040
Captain Distracto
...
- Removed processing recipes from recipe book
- Reorganized items in creative tab
- Tweaked a few model transforms
- Fixed belt uvs
- ponder birbs can now face the cursor
- fix interpolation on ponder birbs
- Fixed log spam when assembling certain blocks (Points of interest) in a contraption
- Fixed content observers not triggering for in-line belt funnels
2021-03-09 01:49:49 +01:00
JozsefA
e943705fb7
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/AllTileEntities.java
# src/main/resources/META-INF/accesstransformer.cfg
2021-03-08 11:06:35 -08:00
simibubi
1a315a11cf
Merge branch 'mc1.15/ponder-ui' into mc1.15/dev
2021-03-08 17:29:06 +01:00
JozsefA
d0e5be24d7
Transformed models.
2021-03-08 00:36:23 -08:00
JozsefA
25fdf08e11
Fog modes for new rendering.
...
- For each fog mode, compile a different version of each shader.
- Could maybe do some fancier preprocessing to make writing shaders easier?
2021-03-04 23:43:28 -08:00
zelophed
d590b23aa7
tagging along
...
- added tags and chapters to the ponder registry
- slightly changed how scenes are registered
- added a back stack to the screen opener and some animations to go along with it
- added a interface for icons drawn into screens
2021-03-04 12:58:26 +01:00
simibubi
8bf82aff79
Refactor Goggles Fluid Information
...
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
2021-03-03 19:17:56 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks
2021-03-03 16:30:59 +01:00
simibubi
2b1c17cb48
Merge pull request #1133 from FrannDzs/patch-2
...
Update es_es.json (HOTFIX)
2021-03-03 16:23:01 +01:00
simibubi
20d8e1d915
Merge pull request #1130 from Alepod/patch-2
...
Update ru_ru.json
2021-03-03 16:22:02 +01:00
simibubi
fe6d9136fc
Merge pull request #1129 from Alepod/patch-1
...
Update ru_ru.json
2021-03-03 16:21:27 +01:00
simibubi
c1c6e5e046
Controlled attachment
...
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
2021-03-03 05:21:58 +01:00
