Commit Graph

Select branches

Hide Pull Requests

alex/fix-leak

fix-ctm-submap-sprites

master

release/2.8.x

release/2.9.x

#1

#10

#100

#101

#102

#103

#103/merge

#104

#105

#105/merge

#106

#107

#108

#109

#109/merge

#11

#110

#110/merge

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#95/merge

#96

#97

#98

#99

2.10.1-GTNH

2.10.10-GTNH

2.10.11-GTNH-dev

2.10.11-GTNH-pre

2.10.12-GTNH

2.10.13-GTNH

2.10.14-GTNH

2.10.15-GTNH

2.10.16-GTNH

2.10.17-GTNH

2.10.18-GTNH-pre

2.10.19-GTNH

2.10.2-GTNH

2.10.3-GTNH

2.10.4-GTNH

2.10.5-GTNH

2.10.6-GTNH

2.10.7-GTNH

2.10.8-GTNH

2.10.9-GTNH

2.11.0-GTNH

2.11.1-GTNH

2.11.2-GTNH

2.11.3-GTNH

2.11.4-GTNH

2.12.0-GTNH

2.12.1-GTNH

2.12.2-GTNH

2.12.3-GTNH

2.13.0-GTNH

2.13.1-GTNH

2.13.2-GTNH

2.13.3-GTNH-pre

2.13.4-GTNH

2.14.0-GTNH

2.14.1-GTNH

2.15.0-GTNH

2.15.1-GTNH

2.15.2-GTNH

2.15.3-GTNH

2.15.4-GTNH

2.15.5-GTNH

2.16.0-GTNH

2.16.1-GTNH

2.16.10-GTNH-pre

2.16.11-GTNH

2.16.12-GTNH

2.16.13-GTNH

2.16.14-GTNH

2.16.15-GTNH

2.16.2-GTNH

2.16.3-GTNH-pre

2.16.4-GTNH

2.16.5-GTNH

2.16.6-GTNH-pre

2.16.7-GTNH-pre

2.16.8-GTNH

2.16.9-GTNH-pre

2.17.0-GTNH

2.17.1-GTNH

2.17.10-GTNH-pre

2.17.11-GTNH

2.17.12-GTNH-pre

2.17.13-GTNH

2.17.14-GTNH

2.17.16-GTNH-pre

2.17.17-GTNH-pre

2.17.18-GTNH

2.17.19-GTNH

2.17.2-GTNH-pre

2.17.20-GTNH

2.17.21-GTNH

2.17.22-GTNH

2.17.23-GTNH

2.17.24-GTNH

2.17.25-GTNH

2.17.26-GTNH

2.17.27-GTNH

2.17.28-GTNH

2.17.29-GTNH

2.17.3-GTNH

2.17.30-GTNH

2.17.31-GTNH

2.17.32-GTNH

2.17.33-GTNH

2.17.34-GTNH

2.17.4-GTNH-pre

2.17.5-GTNH

2.17.6-GTNH

2.17.7-GTNH

2.17.8-GTNH-pre

2.17.9-GTNH

2.18.0-GTNH

2.18.1-GTNH

2.9.7

2.9.8

2.9.9

vCT2.5.0

Mono Color

• 5245737d13 fix for gradle outright dying on IDEA... we'll see what this stomps on later CptSpaceToaster 2015-02-19 23:27:24 -05:00
• 379472423e fix for gradle outright dying on IDEA... we'll see what this stomps on later CptSpaceToaster 2015-02-19 23:27:24 -05:00
• 282d4766d8 Undo formatting changes tterrag1098 2015-02-19 19:15:11 -05:00
• 6a3f2dbe5e Undo formatting changes tterrag1098 2015-02-19 19:15:11 -05:00
• bf4ce506e5 Merge remote-tracking branch 'origin/Cricket' into dev tterrag1098 2015-02-19 19:11:16 -05:00
• 4a8963a80b Merge remote-tracking branch 'origin/Cricket' into dev tterrag1098 2015-02-19 19:11:16 -05:00
• 72a74f1ff6 Forgot the texture... Cricket 2015-02-19 17:14:38 -05:00
• dd53798785 Forgot the texture... Cricket 2015-02-19 17:14:38 -05:00
• e3e7529018 Dev stuff is complete Cricket 2015-02-19 17:13:16 -05:00
• 530239fd72 Dev stuff is complete Cricket 2015-02-19 17:13:16 -05:00
• 8e2adef0ab Begin CTM refactor. Submaps working, lighting not so much tterrag1098 2015-02-18 15:27:57 -05:00
• 3f2e39ceb8 Begin CTM refactor. Submaps working, lighting not so much tterrag1098 2015-02-18 15:27:57 -05:00
• 312a323f96 Update version to 2.3.7 tterrag1098 2015-02-16 12:45:30 -05:00
• ba3f7eb57a Update version to 2.3.7 tterrag1098 2015-02-16 12:45:30 -05:00
• 3dad2f55a0 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-16 12:40:26 -05:00
• 5bf5ce0169 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-16 12:40:26 -05:00
• 25a54b71e1 Fix left clicking a metal block incorrectly changing the type tterrag1098 2015-02-16 12:40:08 -05:00
• 94dd9fc149 Fix left clicking a metal block incorrectly changing the type tterrag1098 2015-02-16 12:40:08 -05:00
• 9c8364caf5 Merge pull request #229 from Adaptivity/patch-1 tterrag1098 2015-02-15 01:55:25 -05:00
• 2181631c79 Merge pull request #229 from Adaptivity/patch-1 tterrag1098 2015-02-15 01:55:25 -05:00
• 86dbd54b16 Update ru_RU.lang Anton 2015-02-15 09:49:40 +03:00
• fa4181ede5 Update ru_RU.lang Anton 2015-02-15 09:49:40 +03:00
• 55807a5f0b Fix present shift clicking tterrag1098 2015-02-14 22:15:45 -05:00
• 65b10dd0e3 Fix present shift clicking tterrag1098 2015-02-14 22:15:45 -05:00
• f130011539 Update changelog tterrag1098 2015-02-14 21:27:46 -05:00
• bc1be0b4fa Update changelog tterrag1098 2015-02-14 21:27:46 -05:00
• 71a9003b79 Fix present localizations tterrag1098 2015-02-14 21:22:11 -05:00
• 510a6fe0a7 Fix present localizations tterrag1098 2015-02-14 21:22:11 -05:00
• 2b4b350d35 Version Bump Cricket 2015-02-14 21:07:20 -05:00
• 23fb1d0d7a Version Bump Cricket 2015-02-14 21:07:20 -05:00
• ea0b64f7e7 Heh Cricket 2015-02-14 21:01:53 -05:00
• f2ef3a740d Heh Cricket 2015-02-14 21:01:53 -05:00
• 31f4d6e05f Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-13 18:44:36 -08:00
• 828abb3ec8 Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-13 18:44:36 -08:00
• 312f5e735c Add Metal block names to Lang file. Drullkus 2015-02-13 18:44:07 -08:00
• 50bd7b5a02 Add Metal block names to Lang file. Drullkus 2015-02-13 18:44:07 -08:00
• 005a8c5b9e I have 2 done, I am not that creative Cricket 2015-02-12 21:33:58 -05:00
• e1d2afccd5 I have 2 done, I am not that creative Cricket 2015-02-12 21:33:58 -05:00
• a7609cff3c Whoops left a sysout tterrag1098 2015-02-11 22:53:05 -05:00
• 6a4619ddae Whoops left a sysout tterrag1098 2015-02-11 22:53:05 -05:00
• c3ee02b3f2 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-11 22:04:11 -05:00
• 364c1a4b44 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-11 22:04:11 -05:00
• 3ed961c526 Fix reamining present issues: - Fix dupes - Fix bounding boxes - Fix inventory order being swapped in the GUI - Fix in-world chiseling not working - Fix losing items when metadata changes tterrag1098 2015-02-11 22:03:53 -05:00
• ffc4ca9308 Fix reamining present issues: - Fix dupes - Fix bounding boxes - Fix inventory order being swapped in the GUI - Fix in-world chiseling not working - Fix losing items when metadata changes tterrag1098 2015-02-11 22:03:53 -05:00
• 41fd650c9a Merge pull request #215 from AtomicBlom/brickTexturing Cricket 2015-02-11 05:44:51 -08:00
• f46b42e924 Merge pull request #215 from AtomicBlom/brickTexturing Cricket 2015-02-11 05:44:51 -08:00
• bc8e2a5c67 Added 16 configuration options to control the color overlay of HexBlocks CptSpaceToaster 2015-02-08 23:37:56 -05:00
• 63ea14f44e Added 16 configuration options to control the color overlay of HexBlocks CptSpaceToaster 2015-02-08 23:37:56 -05:00
• bad1ef296f Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing Steven Blom 2015-02-09 10:10:04 +10:30
• 0425ac5b4d Favour for Drullkus, change V4 and V9 textures to tiling instead of stair-casing Steven Blom 2015-02-09 10:10:04 +10:30
• 56e2a8fea2 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-08 16:18:11 -05:00
• 385c692e1b Merge branch 'dev' of https://github.com/TheCricket/Chisel-2.git into dev tterrag1098 2015-02-08 16:18:11 -05:00
• 31ae34e899 Fix antiblocks not being chiselable even with config set to true Closes #213 tterrag1098 2015-02-08 16:18:01 -05:00
• 64128a241f Fix antiblocks not being chiselable even with config set to true Closes #213 tterrag1098 2015-02-08 16:18:01 -05:00
• b0d968e529 Thing Drullkus 2015-02-07 14:44:05 -08:00
• 6d689a486b Thing Drullkus 2015-02-07 14:44:05 -08:00
• 4afdb1a5b1 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Drullkus 2015-02-07 14:43:08 -08:00
• 09c94fff14 Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev Drullkus 2015-02-07 14:43:08 -08:00
• fa34b7fd22 Fix the patterning on variation. It will now properly please your eyes! Drullkus 2015-02-07 14:36:53 -08:00
• 5c99de382e Fix the patterning on variation. It will now properly please your eyes! Drullkus 2015-02-07 14:36:53 -08:00
• 5adad569df Fix packed ice pillars being transparent (#189) warlordjones 2015-02-07 16:19:43 +00:00
• 355119b424 Fix packed ice pillars being transparent (#189) warlordjones 2015-02-07 16:19:43 +00:00
• 4f514bea5e Add fallback icons for all tabs. Fixes #202 warlordjones 2015-02-07 15:29:26 +00:00
• 6533df5d82 Add fallback icons for all tabs. Fixes #202 warlordjones 2015-02-07 15:29:26 +00:00
• 1e7d12f597 ffs @TheCricket Drullkus 2015-02-06 22:27:15 -08:00
• 213f588d70 ffs @TheCricket Drullkus 2015-02-06 22:27:15 -08:00
• d4366617d1 Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-06 22:25:29 -08:00
• 5ecb45f357 Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-06 22:25:29 -08:00
• e62fe8ef3d Commit working Malfunction fan stuff, and do other stuffs Drullkus 2015-02-06 22:25:09 -08:00
• 97ee6bfd74 Commit working Malfunction fan stuff, and do other stuffs Drullkus 2015-02-06 22:25:09 -08:00
• 92d01d4e5b Add compat for Railcraft 9.5.X. Fixes #203 tterrag1098 2015-02-06 23:11:51 -05:00
• ac41278bfe Add compat for Railcraft 9.5.X. Fixes #203 tterrag1098 2015-02-06 23:11:51 -05:00
• 968782ba0e Add IMC for adding/removing variations and registering oredict tterrag1098 2015-02-06 21:47:17 -05:00
• 723425a471 Add IMC for adding/removing variations and registering oredict tterrag1098 2015-02-06 21:47:17 -05:00
• c527d5d7c5 Fixes #187 Everything else is harvestable by fists Cricket 2015-02-06 21:20:23 -05:00
• 19658240ba Fixes #187 Everything else is harvestable by fists Cricket 2015-02-06 21:20:23 -05:00
• 54f65fab25 Fixes #200 Cricket 2015-02-06 21:13:36 -05:00
• 02e10cf00a Fixes #200 Cricket 2015-02-06 21:13:36 -05:00
• 912fbb6946 Fixes #199 Cricket 2015-02-06 21:03:17 -05:00
• a96df6a782 Fixes #199 Cricket 2015-02-06 21:03:17 -05:00
• f9814209ca Fixes the drullkus derp Cricket 2015-02-06 20:50:26 -05:00
• e11287859d Fixes the drullkus derp Cricket 2015-02-06 20:50:26 -05:00
• 0431b9e119 Commit new Masonry Textures, will implement them later Drullkus 2015-02-04 22:02:59 -08:00
• a504475ed1 Commit new Masonry Textures, will implement them later Drullkus 2015-02-04 22:02:59 -08:00
• ef88c6e85c Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-04 21:02:49 -08:00
• d49c48f7eb Merge remote-tracking branch 'origin/dev' into dev Drullkus 2015-02-04 21:02:49 -08:00
• ed3e85f1a5 Commit new malfunctioning fan tex Drullkus 2015-02-04 21:02:18 -08:00
• 89cb42ca39 Commit new malfunctioning fan tex Drullkus 2015-02-04 21:02:18 -08:00
• 394fb35b1b Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-02-04 20:20:10 -05:00
• 43347a0461 Merge remote-tracking branch 'origin/dev' into dev Cricket 2015-02-04 20:20:10 -05:00
• c279200fc7 Added config option to chisel across colors Cricket 2015-02-04 20:20:01 -05:00
• 21dffb0b3f Added config option to chisel across colors Cricket 2015-02-04 20:20:01 -05:00
• 71061caefe Merge pull request #198 from BigXplosion/recolor Cricket 2015-02-02 16:14:14 -08:00
• 8ff62f185c Merge pull request #198 from BigXplosion/recolor Cricket 2015-02-02 16:14:14 -08:00
• 57f58c35da Allow some blocks to be colored via the forge recolourBlock method big_Xplosion 2015-02-02 22:23:38 +01:00
• fd301b569c Allow some blocks to be colored via the forge recolourBlock method big_Xplosion 2015-02-02 22:23:38 +01:00
• 0064ec320d Fix crash with null facade next to columns tterrag1098 2015-01-31 14:38:50 -05:00
• c39277bef6 Fix crash with null facade next to columns tterrag1098 2015-01-31 14:38:50 -05:00
• b110eab3c3 Clean up @Drullkus' mess tterrag1098 2015-01-31 01:23:27 -05:00
• b35a08bd06 Clean up @Drullkus' mess tterrag1098 2015-01-31 01:23:27 -05:00