Commit graph

Select branches

Hide pull requests

1.16/dev

1.16/fabric/dev

1.17/dev

1.17/fabric/dev

1.18/dev

1.18/fabric/dev

1.18/next

1.19.3/dev

1.19/dev

1.19/fabric/dev

1.20.1/0.6

1.20.1/backend-version

1.20.1/dev

1.20.1/fabric/dev

1.20.1/last-frame-visibility

1.20.1/text-visual

1.20.1/unsquashed

1.20.1/vanillin-stuff

1.20.1/vanillin-xplat

1.21.1/dev

#1

#108

#110

#131

#132

#162

#189

#200

#204

#213

#214

#22

#224

#228

#229

#230

#231

#235

#236

#238

#24

#240

#241

#244

#249

#250

#251

#253

#254

#255

#256

#257

#261

#262

#265

#268

#269

#270

#36

#43

#75

#77

#89

#93

#97

#98

Mono Color

• b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev Bob Dole 2020-10-19 23:22:24 -0400
• e54cdf1c96 Lang file Tweaks Kryppers 2020-10-20 00:10:19 +0100
• 9729c137f1 Fix Bell contraptions and Schematic usage Bob Dole 2020-10-19 18:40:59 -0400
• 42f97477cf Up-tip the tools. Kryppers 2020-10-19 23:16:33 +0100
• 68840362af Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-19 22:07:07 +0200
• b7bed44a61 Basic Brewing simibubi 2020-10-19 22:07:05 +0200
• cfda2c624d
  Merge pull request #487 from wchen1990/mc1.16/dev simibubi 2020-10-18 14:53:13 +0200
• 21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev - Resolved merge conflicts Bob Dole 2020-10-18 00:22:25 -0400
• a81a4110d4 Tools: the Tippening. Kryppers 2020-10-18 00:10:10 +0100
• 2cba50c9ab Tool-Tip of the Iceberg Kryppers 2020-10-17 20:57:14 +0100
• dd95096bfa Smart Fluid Pipes simibubi 2020-10-17 18:20:05 +0200
• bbe7ef820d Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-17 17:33:54 +0200
• 7ef31b9053 Spooky Filters Zelophed 2020-10-17 17:32:37 +0200
• 083a9c1140 Refactor FluidContentsAttribute Colman Davenport 2020-10-17 11:24:15 -0400
• 42ef3796a2 Refactor EnchantAttribute Colman Davenport 2020-10-17 11:23:38 -0400
• 6d51a6c730 Astral Sorcery Attributes Colman Davenport 2020-10-17 01:25:29 -0400
• 822ca6dad6 Lang Colman Davenport 2020-10-17 01:17:25 -0400
• 562abdea31 Written Book Attributes Colman Davenport 2020-10-17 01:16:32 -0400
• c1bb1e64c9 Custom Name Attributes Colman Davenport 2020-10-17 00:58:49 -0400
• 6ff57ca65c Fluid Container Attributes Colman Davenport 2020-10-17 00:26:16 -0400
• a7e2d842af Specific Enchantment Attribute Colman Davenport 2020-10-17 00:04:23 -0400
• 49ed619a79 ForgeCraft Playtesting, Part III-b Zelophed 2020-10-17 04:29:00 +0200
• f499122ae5 Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-17 04:21:50 +0200
• d585fc0e21 ForgeCraft Playtesting, Part III-a Zelophed 2020-10-17 04:15:51 +0200
• b5930df58a merge changes from 1.15 Zelophed 2020-10-16 19:19:55 +0200
• b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev Zelophed 2020-10-16 19:11:29 +0200
• a2e4cfb66d fixup! Split mixing and mechanical crafting categories Zelophed 2020-10-16 18:58:35 +0200
• 022bcdd620 Split mixing and mechanical crafting categories Zelophed 2020-10-16 18:57:21 +0200
• 34bfa2f479 Remove TiC run reference grimmauld 2020-10-16 17:00:43 +0200
• c44d80ac82 TiC casting table(basin compat grimmauld 2020-10-16 15:32:58 +0200
• a440ab6772 Make tree fertilizer work on slime saplings grimmauld 2020-10-16 12:18:14 +0200
• 893294b9e4 make the saw work grimmauld 2020-10-16 11:37:28 +0200
• c9e2f8b05e Deforester works on slime saplings grimmauld 2020-10-16 11:14:47 +0200
• db2b8dd197 ForgeCraft Playtesting, Part II simibubi 2020-10-14 21:15:19 +0200
• 69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-14 21:06:46 +0200
• dcd0598e16 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-14 20:52:40 +0200
• 62434fd564 That's hot simibubi 2020-10-14 20:52:38 +0200
• 277e4ea9d1 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev grimmauld 2020-10-14 16:37:27 +0200
• 6200329e43 Fix botania petal milling grimmauld 2020-10-14 16:36:53 +0200
• 31baac3c8c Not Enough Bugs - fixed last blaze burner of a stack disappearing when clicking a blaze entity - remove dead code from the valve handle class grimmauld 2020-10-14 16:13:09 +0200
• 40c4059b75 Tooltips? more like Cool-tips! Kryppers 2020-10-13 23:59:02 +0100
• f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-13 20:57:30 +0200
• d973e9bcdd JEI fixes simibubi 2020-10-13 20:39:44 +0200
• 9b5707cba6 ForgeCraft Playtesting, Part I simibubi 2020-10-13 19:56:12 +0200
• 677363f1b8 Update rendering Colman Davenport 2020-10-13 00:10:23 -0400
• b89710237d Saws check actual verticality in contraptions Colman Davenport 2020-09-12 18:44:53 -0400
• 5342beacaf Conditional moving saw operation Colman Davenport 2020-09-12 15:47:27 -0400
• a28b6bbdc3 Overhaul mechanical saw rendering Colman Davenport 2020-09-11 23:50:34 -0400
• 442d89e09e Port Changes to 1.16, Fix server launch simibubi 2020-10-12 22:16:06 +0200
• cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 22:15:32 +0200
• 5966040d12 Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 21:59:30 +0200
• afa94c3e77 Blazier updates simibubi 2020-10-12 21:55:09 +0200
• be8924a154 Port changes to 1.16 simibubi 2020-10-12 16:25:57 +0200
• df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev simibubi 2020-10-12 16:25:46 +0200
• 56f5ca45e3
  Merge pull request #456 from gamrguy/kelp-harvester simibubi 2020-10-12 16:09:40 +0200
• dbf4e50bb4
  Merge pull request #483 from woow101/mc1.15/dev simibubi 2020-10-12 16:05:17 +0200
• 9852d84fb8 More logistical errands simibubi 2020-10-12 16:03:26 +0200
• cbd59871cc
  Update advancements.json woow101 2020-10-12 03:12:19 -0500
• 895131ad72
  Update advancements.json woow101 2020-10-12 02:28:28 -0500
• 0f2ecfd45e merge nixie tubes to 1.16 grimmauld 2020-10-11 19:14:37 +0200
• 1b84bbf16f Custom Nixies simibubi 2020-10-11 17:50:48 +0200
• 83918a6aaf Fix build issues by not relying on modmaven, update JEI dependency to use dedicated 1.16.3 files grimmauld 2020-10-11 15:43:04 +0200
• 131669c9ff Temporarily fix fluid tag serialization grimmauld 2020-10-11 12:38:50 +0200
• 3e3b0dad6e port changes to 1.16 grimmauld 2020-10-10 22:40:59 +0200
• 1a4814e724 merge mc1.15/dev into mc1.16/dev grimmauld 2020-10-10 21:46:40 +0200
• 22ed233969 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-10 21:15:48 +0200
• f3deb8ba85 Tilted Trains simibubi 2020-10-10 21:12:28 +0200
• 88b8e7744f Merge branch 'mc1.15/dev' into mc1.16/dev grimmauld 2020-10-10 19:45:52 +0200
• 474d21de9a clean up some unused imports grimmauld 2020-10-10 18:23:56 +0200
• 850297f777 Switch valve handles back to crank shapes as those fit better to the new model grimmauld 2020-10-10 18:16:28 +0200
• cb135df649 Configurable hunger games grimmauld 2020-10-10 18:13:40 +0200
• 9bff016ba4 Depot comparing grimmauld 2020-10-10 17:54:17 +0200
• 299663295c fixes now for 1.16.3 grimmauld 2020-10-10 10:26:54 +0200
• f593aca95d fix build issues grimmauld 2020-10-09 20:36:40 +0200
• 23beff40f3 Chute and Air: hopefully fix non-dev env issues grimmauld 2020-10-09 20:28:20 +0200
• 0da410b105 port recent changes to 1.16.3 grimmauld 2020-10-09 19:42:32 +0200
• 71ebdf044b Chute and Air. This took way too long. grimmauld 2020-10-09 19:00:00 +0200
• 3956875334 The Coupling Capability simibubi 2020-10-08 20:13:17 +0200
• 36a96d35e3 fix some rendering to use matrix stacks grimmauld 2020-10-07 22:32:03 +0200
• 482e02e5d3 Fix zapper not working (StringTextComponent.EMPTY != null) grimmauld 2020-10-07 12:21:48 +0200
• 6649ae8d28 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev grimmauld 2020-10-07 12:14:04 +0200
• 699dc7bb5c Issues with Nested Config groups simibubi 2020-10-07 11:46:55 +0200
• b9476b58ce bare basin business, but 1.16 grimmauld 2020-10-06 21:42:31 +0200
• 378164b8b9 More unfinished basin business simibubi 2020-10-06 20:43:13 +0200
• 5401d96942 Fixed item tooltips grimmauld 2020-10-06 20:11:58 +0200
• fb626eac1b Gauge goggle overlay is now displayed correctly grimmauld 2020-10-06 17:54:17 +0200
• e8c458f2ad Fix even more text components, now in tooltips grimmauld 2020-10-06 15:54:16 +0200
• 0d972e144f Fix some more text components grimmauld 2020-10-06 12:21:13 +0200
• 33b8d2bd85 Fix matrix stack rotations grimmauld 2020-10-04 15:39:32 +0200
• eda8bfd0a1 Fixed crash on pressing alt key on schematic screen grimmauld 2020-10-04 14:16:05 +0200
• 5993c30a3e fix contraption crashing the renderer grimmauld 2020-10-04 13:48:30 +0200
• fdf9fdcd78 Fixed some text component stuff i messed up earlier grimmauld 2020-10-04 10:35:58 +0200
• bc4418a929 Port recent changes to compile simibubi 2020-10-04 01:59:51 +0200
• 31e35d060f fixed merge conflicts grimmauld 2020-10-04 01:08:13 +0200
• 37a61ef0e4 Fix GeneratingKineticTileEntity rendering the gui overlay crashing the game grimmauld 2020-10-04 00:05:33 +0200
• a15937b5fc Fix datagen issues, ingame achieved! tterrag 2020-10-03 17:36:32 -0400
• e5179598e3 Get things running, fix forge/mc dependencies and extendo grip tterrag 2020-10-03 17:12:32 -0400
• 3be810a9eb Yet more porting, bodge to let SchematicWorld implement IServerWorld tterrag 2020-10-03 16:27:09 -0400
• 74fadd94d6 More porting, fix updateNeighbors and particle codecs tterrag 2020-10-03 16:14:14 -0400
• b14e94929c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev simibubi 2020-10-02 14:41:49 +0200