mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 07:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,051 Commits 31 Branches 14 Tags 106 MiB
5a7a35b3cc
Commit Graph

2051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JozsefA
5a7a35b3cc Sounds in the right places and no stacking 2021-06-26 10:40:10 -07:00
reidbhuntley
9ddc520652 Curses 
- Added the Peculiar Bell and the Cursed Bell
 2021-06-26 12:05:38 -04:00
simibubi
fbcaa1b931 Fwoomp of Duty: Black Crops 4 
- Introduced proper first-person rendering of Potato Cannons, inherited from blockzappers
- Introduced proper dual wield handling for Potato Cannons
- Potato cannons are no longer stackable
- Added a couple more attributes to ammo types
- potatoes and carrots now plant a crop when hitting farmland
- Added a couple particle effects
- Fwoomp sound now slightly randomizes its pitch
 2021-06-26 16:32:56 +02:00
simibubi
6feacd3fc2 Fix cart contraption pickup 2021-06-26 12:28:03 +02:00
PepperBell
737b7ad255 Extra recipes 
- Add chocolate melting, honey liquification, and honey compacting
recipes
- Create honey tag field and use Forge's milk tag field
- Make fluid fields final
- Closes #1845
 2021-06-26 00:30:01 -07:00
PepperBell
de929ef510 GUI cleanup and fixes part 2 
- Change positions of more GUI elements
- Fix mistakes from last cleanup
- Add window offset to AbstractSimiScreen
- Implement container usability check properly and add
IInteractionChecker
- Render schematic and quill in schematic prompt screen
- Rename curiosities2.png to curiosities_2.png
- Various other tweaks, fixes, and improvements
- Resolves #1847
 2021-06-25 22:16:17 -07:00
simibubi
5a30c3bcdb Vegetable accelerator 
- Added the Potato Cannon
- Extendogrips now have durability, which is not consumed while wearing a copper backtank (same applies for potato cannon)
- Added a few projectile types for testing
 2021-06-26 01:17:35 +02:00
JozsefA
760486adb6 Bump flywheel build 2021-06-24 19:52:56 -07:00
simibubi
ef74d9eef9 Ponder à la carte 
- An overview of Ponder Tags can now be opened from the game menu
 2021-06-25 00:55:40 +02:00
simibubi
12085ed909 Merge branch 'mc1.16/fluid-ponder' into mc1.16/dev 2021-06-24 23:38:56 +02:00
PepperBell
ce332bfe40 Fix config comment dividers 
New Forge versions replace empty comments with "No comment", so the
divider comment was changed from "" to " ".
 2021-06-24 14:28:40 -07:00
JozsefA
23eb51abd2 Bump flywheel build 2021-06-24 14:27:45 -07:00
simibubi
40cbbf2b29 Thinking beyond Pipes 
- Pondering for Spouts, Item Drains and Portable Fluid Interfaces
- Removed tooltips for fluid components
 2021-06-24 22:37:30 +02:00
simibubi
ab8b8e41da Thinking about Pipes 
- Survival mode players can now configure the fluid supplied by a creative fluid tank
- Pondering for Tanks, Creative Tanks and Hose Pulleys
 2021-06-24 18:22:28 +02:00
simibubi
9a020dd02a Thinking via Pipes 
- Pondering for Pumps, Smart Pipes, Valves
 2021-06-24 11:49:46 +02:00
JozsefA
0c5fb3de3e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-24 01:21:45 -07:00
JozsefA
abf8bc8a4e Fix crash on resource reload 
- Invalidate contraption renderers on context gathering
 2021-06-24 01:21:33 -07:00
PepperBell
178af2061f Fix harvester culling 
- Make harvester's render box a unit cube
- Expose manually animated speed through getter
 2021-06-23 23:05:31 -07:00
PepperBell
8d90137b1a Remove TooltipHelper.getUnformattedDeepText 
- Replace it with ITextComponent.getString
 2021-06-23 22:32:42 -07:00
JozsefA
1e65e3aee6 Bump flywheel build 2021-06-23 13:29:45 -07:00
JozsefA
3ce4e2c5e8 Cleanup flywheel event listeners, fix crash on server startup 2021-06-23 13:19:03 -07:00
PepperBell
0bc1a71558 Crash-proof nixie tubes 
- Add many checks when reading NBT to prevent crashes
- Store rendered strings and only update when necessary
- Reorganize some code and rename some members
 2021-06-23 12:34:12 -07:00
PepperBell
c9f9be73ff Buildscript tweaks 
- Move Flywheel version to gradle.properties
- Use implementation instead of compile
 2021-06-23 12:30:10 -07:00
JozsefA
c9d95e83ae Bump flywheel build 2021-06-23 09:13:31 -07:00
JozsefA
d189efd987 Whoops missed some classes 2021-06-23 00:16:24 -07:00
JozsefA
312b327161 Fix fluid rendering bug 
- ContraptionRenderDispatcher wasn't cleaning up its state, so fluids were being drawn with the wrong shader program
 2021-06-23 00:01:19 -07:00
JozsefA
64c55c1205 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	README.md
#	src/generated/resources/.cache/cache
#	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/es_mx.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/pl_pl.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/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
 2021-06-22 21:13:34 -07:00
JozsefA
dd63c6c4e3 Cleanup and get ready to merge 2021-06-22 21:09:32 -07:00
grimmauld
e4a340deef Maybe fix NPE in basin tile entity. Probably should check more thoroughly, but this should patch it for now 2021-06-22 20:58:23 +02:00
simibubi
02ff18fcce
The CF badge broke 2021-06-22 12:00:17 +02:00
simibubi
0a376b719e Thinking with Pipes 
- Implemented ponder scenes for Fluid Pipes and Copper Casing
- Adjusted Fluid transfer, containment and rendering behaviours to function in 'virtual' environments
 2021-06-21 18:46:31 +02:00
reidbhuntley
813a1ccaba Prevent Belts under Tunnels from picking up item entities 2021-06-20 15:00:31 -04:00
reidbhuntley
ba0e851487 Fix inconsistency with Deployers on contraptions 
- Previously Deployers would sometimes collide with the contraption entity they were a part of and their activation would be consumed
 2021-06-20 11:07:27 -04:00
reidbhuntley
e71d03c375 Fix Deployer inventory-voiding bug 
- Deployers' inventories will no longer be voided when their contraption is disassembled and reassembled before the DeployerTileEntity can initialize
 2021-06-20 01:55:08 -04:00
JozsefA
aeff644cc3 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.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/es_mx.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/pl_pl.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/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/AllContainerTypes.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
#	src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterContainer.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
#	src/main/java/com/simibubi/create/foundation/gui/mainMenu/CreateMainMenuScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
#	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/assets/create/lang/default/messages.json
#	src/main/resources/assets/create/lang/default/tooltips.json
 2021-06-19 16:11:18 -07:00
PepperBell
6d177c4366 Post-PR datagen 2021-06-19 12:44:03 -07:00
PepperCode1
1459be7926
Merge pull request #1565 from MarioSMB/mc1.16/dev 
Various recipe fixes and adjustments to improve mod compatibility
 2021-06-19 12:37:24 -07:00
JozsefA
652111c233 Yeet 2021-06-19 00:29:18 -07:00
reidbhuntley
cded120a0c Write NBT 2021-06-18 21:37:17 -04:00
reidbhuntley
e0941d7ba2
Merge pull request #1781 from AtlaStar/mc1.16/issue-1779-fix 
Make Basin spouts properly empty into paired Funnels
 2021-06-18 21:25:12 -04:00
reidbhuntley
f8111205b3 Temporary turnaround 
- Fixed Minecart Contraption Item's initial orientation being incorrect inconsistent in certain situations
 2021-06-18 20:44:15 -04:00
reidbhuntley
ecfa554c05 Spawn control 
- Cart Contraptions with attached Spawners can no longer be picked up with a wrench (configurable)
 2021-06-18 17:34:39 -04:00
simibubi
bc2b5169c8 The forgotten Keyframes 
- Added Keyframes to scenes created before the feature existed
 2021-06-18 22:13:34 +02:00
simibubi
91bc678ab4 Finding bugs explaining things 
- The portable fluid interface now waits until extracting pipes have completed their flow before disengaging
 2021-06-18 18:48:12 +02:00
simibubi
1bab1bc6d3 Ponder prep, Part II 
- Added scene for deployer's new item processing
- Fixed particles rendering faced away from the camera
- Fixed airflow particles not getting lit properly
- Fixed lack of culling in Gui ItemStack elements
- Prepared texts for all fluid-related storyboards
- Fixed ponder progress bar not displaying
 2021-06-18 18:13:40 +02:00
simibubi
c23071863d Ponder prep 
- Added tooltips for newly added tools and equipment
- Fixed depth issues in Ponder UI
- Fixed lack of backface culling in ponder
- Added placeholder storyboards for missing ponder scenes
- Fixed menu screen cogs rendering behind the background
- Fixed menu screen not pausing the game
 2021-06-18 12:45:43 +02:00
PepperBell
57c68409f5 Downgrade Registrate 
- Downgrade Registrate from 1.0.5 to 1.0.4
 2021-06-17 22:29:02 -07:00
PepperBell
1e41a390e4 Update buildscript 
- Update Gradle from 5.6.3 to 5.6.4
- Move some versions to gradle.properties
- Switch to new Forge Maven URL
- Update JEI to 1.16.5 and Mixin processor to 0.8.2
- Add out/ to .gitignore
 2021-06-17 22:04:21 -07:00
PepperBell
a15c9b0ad5 Fix errors from last commit 
- Create method overload in SchematicItem to solve errors
- Organize imports and do formatting in schematic related classes
 2021-06-17 20:32:52 -07:00
reidbhuntley
96e865be02 Schematic insta-placement now uses Schematicannon logic 2021-06-17 22:47:38 -04:00