Commit Graph

Select branches

Hide Pull Requests

master

mu

postea-custom-data

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#136/merge

#137

#138

#138/merge

#14

#140

#140/merge

#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

#38/merge

#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

#96

#97

#98

#99

3.1.0

3.1.1

3.2.0

3.3.0

3.4.0

3.5.0

3.5.1

3.5.2

3.5.3

3.5.4

3.5.5

3.5.6

3.6.0

3.6.1

3.6.10

3.6.11

3.6.12

3.6.2

3.6.3

3.6.4

3.6.5

3.6.6

3.6.7

3.6.8

3.6.9

4.0.0

4.0.1

4.0.10

4.0.11

4.0.2

4.0.3

4.0.4

4.0.5

4.0.6

4.0.7

4.0.8

4.0.9

4.1.0

4.1.1

4.10.0

4.10.1

4.10.10

4.10.11

4.10.12-pre

4.10.13

4.10.14

4.10.15

4.10.16

4.10.17

4.10.18-pre

4.10.2

4.10.3

4.10.4-pre

4.10.5

4.10.6

4.10.7

4.10.8

4.10.9-pre

4.11.0

4.11.1-pre

4.11.10

4.11.11

4.11.12

4.11.13

4.11.14

4.11.15

4.11.16

4.11.17

4.11.18

4.11.19

4.11.2

4.11.20-pre

4.11.21-pre

4.11.22-pre

4.11.23

4.11.24-pre

4.11.25-pre

4.11.26

4.11.27

4.11.28

4.11.29

4.11.3-pre

4.11.30

4.11.31

4.11.32

4.11.33

4.11.34

4.11.35

4.11.36

4.11.37

4.11.38

4.11.39

4.11.4

4.11.40

4.11.5-pre

4.11.6

4.11.7

4.11.8

4.11.9

4.2.0

4.2.1

4.2.10

4.2.11

4.2.12

4.2.13

4.2.19.0

4.2.2

4.2.20.0

4.2.21.0

4.2.22.0

4.2.23.0

4.2.24.0

4.2.25.0

4.2.26.0

4.2.27.0

4.2.3

4.2.4

4.2.5

4.2.6

4.2.7

4.2.8

4.2.9

4.3.1.0

4.4.0

4.4.1

4.4.10

4.4.11-pre

4.4.12

4.4.13

4.4.14

4.4.15

4.4.16

4.4.2

4.4.3

4.4.4

4.4.5

4.4.6

4.4.7

4.4.8

4.4.9

4.5.0

4.5.1

4.5.2

4.5.3

4.5.4

4.5.5

4.5.6

4.5.7

4.5.8

4.5.9-pre

4.6.0

4.6.1

4.6.10

4.6.11-pre

4.6.12-pre

4.6.13

4.6.14

4.6.2-pre

4.6.3

4.6.4-pre

4.6.5

4.6.6

4.6.7

4.6.8

4.6.9-pre

4.7.0

4.7.1

4.8.0

4.8.1

4.8.10

4.8.2

4.8.3-pre

4.8.4

4.8.5

4.8.6-pre

4.8.7

4.8.8

4.8.9

4.9.0

4.9.1

4.9.10

4.9.11-pre

4.9.12

4.9.13-pre

4.9.14-pre

4.9.15

4.9.16

4.9.17

4.9.18

4.9.19

4.9.2-pre

4.9.20

4.9.21

4.9.22

4.9.3

4.9.4-pre

4.9.5

4.9.6-pre

4.9.7

4.9.8-pre

4.9.9-pre

latest

v.5.5.5

v4.2.14

v4.2.15

v4.2.16

v5.0.0

v5.0.1

v5.0.10

v5.0.11

v5.0.12

v5.0.13

v5.0.14

v5.0.15

v5.0.16

v5.0.17

v5.0.18

v5.0.19

v5.0.2

v5.0.20

v5.0.21

v5.0.22

v5.0.23

v5.0.24

v5.0.3

v5.0.4

v5.0.5

v5.0.6

v5.0.7

v5.0.8

v5.0.9

v5.1.0

v5.1.1

v5.1.10

v5.1.11

v5.1.12

v5.1.13

v5.1.2

v5.1.3

v5.1.4

v5.1.5

v5.1.6

v5.1.7

v5.1.8

v5.1.9

v5.2.0

v5.2.1

v5.2.10

v5.2.11

v5.2.12

v5.2.13

v5.2.14

v5.2.15

v5.2.17

v5.2.2

v5.2.3

v5.2.4

v5.2.5

v5.2.6

v5.2.7

v5.2.8

v5.2.9

v5.3.0

v5.3.3

v5.3.4

v5.4.1

v5.4.2

v5.4.3

v5.5.0

v5.5.1

v5.5.2

v5.5.3

v5.5.4

v5.5.6

v5.6.0

v5.8.0

v5.8.1

Mono Color

• 5db5b712ce Fixed Mutation Coniditons (#5) bartimaeusnek 2020-03-27 14:12:42 +01:00
• 9cac9a14df bump version 4.2.25.0 Dream-Master 2020-03-23 22:29:01 +01:00
• 43f98e9cca fixed method not found exception wrong class for get Method call... i hate reflexion >_> bartimaeusnek 2020-03-23 17:18:25 +01:00
• ff4c09324b update gradle Dream-Master 2020-03-23 13:57:14 +01:00
• d1c17a13b1 BartWorks support for apiculture requirements (#4) 4.2.24.0 ElNounchandbartimaeusnek 2020-03-22 15:03:20 +01:00
• 8a8ac56266 bump version 4.2.23.0 Jason Mitchell 2020-02-29 20:26:02 -08:00
• 208de8ad3a Fix NPE Jason Mitchell 2020-02-29 20:23:52 -08:00
• d988fb849d bump version 4.2.22.0 Dream-Master 2020-02-16 12:53:28 +01:00
• ab83d90dd3 Merge pull request #3 from GTNewHorizons/limit_butterflies_distance_from_home Martin Robertz 2020-02-16 11:39:35 +01:00
• 79c5cff926 Backport butterflys staying close to home from https://github.com/ForestryMC/ForestryMC/commit/904293f407c2e9ceeb35dcb9178ed505f361a0f3#diff-96a2a2f1a71177681853bd9c5eb46752 Jason Mitchell 2020-02-15 21:31:55 -08:00
• 5522c33924 Merge pull request #2 from GTNewHorizons/feature/shiftlag 4.2.21.0 Martin Robertz 2019-12-14 21:00:39 +01:00
• 93aa429cf2 Add config options, remove debug prints Richard Hendricks 2019-12-14 13:44:27 -06:00
• fa5c4c0218 Remove isDirty related stuff, it causes stack overflows because it is not properly cleared when the craft is partial. Performance now should be good enough we don't even care about a few extra calls. Richard Hendricks 2019-12-14 02:04:02 -06:00
• 32691c6af4 Add in local recipe cache Richard Hendricks 2019-12-13 17:41:58 -06:00
• 5615ffc518 Recipelist acceleration is working. Worktable local cache needs creating. Richard Hendricks 2019-12-13 00:12:06 -06:00
• 2af41cf68d not working Richard Hendricks 2019-12-12 20:16:58 -06:00
• 0cdaf8cff8 Add new limiting crafting time function. Richard Hendricks 2019-12-09 22:07:26 -06:00
• 7b5eafc42a update version 4.2.20.0 Dream-Master 2019-05-12 20:32:50 +02:00
• 59ca1d2082 Merge pull request #1 from GTNewHorizons/giantSequoia Martin Robertz 2019-05-09 09:46:14 +02:00
• 0df88973c0 added recipe. bartimaeusnek 2019-05-09 06:35:23 +02:00
• e54bb5d4ea change api path Dream-Master 2019-03-26 09:06:46 +01:00
• 824f155804 change api adress Dream-Master 2019-03-26 09:01:05 +01:00
• 24e2cf668e Revert "remove redstone flux not working api" Dream-Master 2019-03-26 08:55:47 +01:00
• f260099bfa remove redstone flux not working api 4.2.19.0 Dream-Master 2019-03-26 08:46:07 +01:00
• 855d359b02 changed crop logic a bit if crop havest is not possible at the optimal state, just harvest, ffs. bartimaeusnek 2019-03-23 23:29:26 +01:00
• abcb180689 added a null check bartimaeusnek 2019-03-18 18:58:33 +01:00
• 507adb1b3f version bump Jason Mitchell 2018-10-06 09:09:25 -07:00
• 23c4e4ed91 Fix pollination crash Jason Mitchell 2018-10-06 09:08:06 -07:00
• d2d9da6af7 Version 5.8.1 Release v5.8.1 mezz 2018-07-15 13:42:27 -07:00
• a9819781d0 Clean up some condition checking (#2191) temp1011 2018-07-12 21:11:41 +01:00
• 055834b63a Fix some crashes when disabling fluids #2188 (#2190) temp1011 2018-07-12 21:11:29 +01:00
• e244a0c82c Fix cocoon tile name (#2181) temp1011 2018-07-12 21:10:21 +01:00
• ef96f754d8 fix uncraftable capsules with apiculture disabled #2183 (#2184) temp1011 2018-07-11 14:34:30 +01:00
• 32270601e7 Merge remote-tracking branch 'origin/mc-1.12' into mc Nedelosk 2018-07-11 15:28:20 +02:00
• 823305dd94 Fix #2165, #2186, #2166 De-Sync of all inventory containers and guis Nedelosk 2018-07-11 15:27:56 +02:00
• bbf80a4320 Update ru_ru.lang (#2122) Konstantin 2018-07-11 15:21:08 +03:00
• 4057537027 Update zh_cn.lang (#2187) Urey. Xue 2018-07-11 20:20:38 +08:00
• 3a294b79a7 Fix buildcraft dependencies (#2180) temp1011 2018-07-09 23:00:41 +01:00
• 206d483422 Fix tree gen #2178 (#2179) temp1011 2018-07-08 14:14:23 +01:00
• 6d51d53da1 Add interface for more easy handling of charcoal pile walls Nedelosk 2018-07-06 01:43:28 +02:00
• 1ee6c05494 Update JEI and add farming JEI Category Nedelosk 2018-07-05 17:12:20 +02:00
• 8feb3500a4 BuildCraft support (#2158) therealfarfetchd 2018-06-28 21:54:17 +02:00
• 4515aa513a Update TileEntityDataFixable log from 'info' to 'debug' Nedelosk 2018-06-28 21:48:21 +02:00
• c06057ddd0 Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into tile-test Nedelosk 2018-06-28 21:43:16 +02:00
• 9b4a4c2b1d Fix Tile Entity Registration Nedelosk 2018-06-28 18:23:45 +02:00
• 2b3d21b05d prevent effect damage underwater (#2149) temp1011 2018-06-27 02:06:57 +01:00
• cb43bbee52 fix broken texture in butterfly model #2171 (#2173) temp1011 2018-06-27 02:06:46 +01:00
• b92a1a10e9 add kill count to butterfly kill command (#2174) temp1011 2018-06-27 02:06:38 +01:00
• 8a431e56ef Update zh_cn.lang (#2169) Urey. Xue 2018-06-24 05:01:51 +08:00
• f73b48695e Merge remote-tracking branch 'origin/mc-1.12' into bug-1.12 Nedelosk 2018-06-22 11:25:19 +02:00
• 0454fea0a8 Fix broken Flower Cache synchronisation to the client and disk Nedelosk 2018-06-22 11:25:03 +02:00
• 4ff772954e fix a bug in hasFlowersCache (#2168) temp1011 2018-06-19 18:48:32 +01:00
• d8304d5d7e fix log not formatting correctly #2023 (#2164) temp1011 2018-06-19 18:48:24 +01:00
• a12cfff9d9 Clean Up Analyzer Provider Nedelosk 2018-06-16 17:50:56 +02:00
• d34ad60d31 Fix #2159 Minecart Apiary Gui Crash Nedelosk 2018-06-16 17:46:27 +02:00
• 508b26ca45 Update ForestryPacket.java Nedelosk 2018-06-15 10:30:37 +02:00
• 255bd9da99 Fix #2157 Crash on attempt to break Dehumidifier while camouflaged as block from Chisel Nedelosk 2018-06-14 20:09:35 +02:00
• 5cedc2adca Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev Nedelosk 2018-06-14 19:36:39 +02:00
• c968278d27 Fix #2160 Remove @SideOnly(Side.CLIENT) from IAlyzerPlugin Nedelosk 2018-06-14 19:36:20 +02:00
• 2392785daa Better zh_cn.lang translation file update. (#2146) src_resources 2018-06-14 11:10:57 -05:00
• e82691165f Add config for global biome blacklisting for trees and bees (#2150) temp1011 2018-06-14 17:09:54 +01:00
• e54cd57162 clean up some config comments (#2153) temp1011 2018-06-14 17:07:42 +01:00
• 0a3a933b77 Cleanup (#2138) temp1011 2018-06-14 17:07:31 +01:00
• 10dbed1406 Merge pull request #2151 from rosebeats/mc-1.12 Nedelosk 2018-06-14 18:05:48 +02:00
• b515870cb4 Merge remote-tracking branch 'origin/mc-1.12' into dev Nedelosk 2018-06-14 18:02:36 +02:00
• 30010d2554 Improve and Clean Up Gui Elements Nedelosk 2018-05-31 18:10:05 +02:00
• e5057788a8 version bump bartimaeusnek 2018-06-09 17:08:51 +02:00
• 317d9abfda fixed the localization names for the StorageJeiPlugin rosebeats 2018-06-07 21:00:39 -04:00
• a5045bfc0f try to limit nbttag compound on apiaries to 128 entries bartimaeusnek 2018-06-08 00:52:00 +02:00
• bfd678c63e removed shades Java7Checker due to issures with Java 9 + updated Forge Version to v1614 + updated used Java version to v8 + updated used grandle wrapper to 2.14.1 bartimaeusnek 2018-06-07 20:15:02 +02:00
• 7df3a94916 Merge pull request #2142 from temp1011/plugin-compat Nedelosk 2018-05-28 22:58:09 +02:00
• 8158562974 fix ic2 crash with apiculture #2139 temp1011 2018-05-28 14:28:55 +01:00
• a96ce6c873 use new maven for teslaAPI (#2133) temp1011 2018-05-28 13:06:39 +01:00
• 6efbdd747d Improve Industrialcraft2 plugin (#2057) temp1011 2018-05-28 13:05:32 +01:00
• 82dd0e5eed Update frames.json (#2137) Jason Carrete 2018-05-27 05:57:29 -04:00
• 64c0590bef Fix Manual Multi-Farms placing humus Nedelosk 2018-05-17 15:28:49 +02:00
• 691ccd578e Fix #1525 Balance Electric Engine Circuits Nedelosk 2018-05-11 12:27:58 +02:00
• 98cd99aa4e Fix #1914 Forestry Not Playing Right with Fast Leaf Rendering Options. Nedelosk 2018-05-11 12:17:12 +02:00
• cd8e78f60a Merge remote-tracking branch 'origin/mc-1.12' into dev Nedelosk 2018-05-11 11:37:21 +02:00
• 5ed536da7c Fix #2021 Multifarm configurable without board bug Nedelosk 2018-05-11 11:19:07 +02:00
• 96ca20c784 Add configuration for crates (#2047) temp1011 2018-05-11 10:04:11 +01:00
• 764d969bb4 Fixed Backpacks Localization (#2120) Dmitriy Medvedev 2018-05-11 12:02:55 +03:00
• a26a86fe99 use mod log rather than fml log (#2129) temp1011 2018-05-11 10:02:43 +01:00
• ebe6580aaf Fix #2130 Can't insert Immersive engineering industrial hemp into crop multifarm block Nedelosk 2018-05-11 11:01:02 +02:00
• e90ab8caf6 Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev Nedelosk 2018-05-04 15:04:20 +02:00
• efdffd31c8 Fix #2113 Conduits / Itemducts not working with alveary Nedelosk 2018-05-04 15:04:07 +02:00
• fa515f0941 Fix #2114 Limit crafting operations to 64 crafts per shift-click mezz 2018-05-02 21:57:28 -07:00
• 78c033a7d2 Clean up code (#2053) temp1011 2018-05-01 18:48:06 +01:00
• 4975fa80c3 Make tree gen be configurable (#2046) temp1011 2018-05-01 17:42:46 +01:00
• aa642a3ee8 small fix for a JEI log error (#2110) temp1011 2018-05-01 17:42:24 +01:00
• b19809bd3c Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev Nedelosk 2018-05-01 18:42:01 +02:00
• b566a1befd small fix comb recipes (#2112) temp1011 2018-05-01 17:41:49 +01:00
• 88c9270316 Fix #2082 Unable to put fuel into the fermenter Nedelosk 2018-05-01 18:41:32 +02:00
• f52cc3893b Add lang file back Nedelosk 2018-04-29 12:27:25 +02:00
• b7578e3a11 Remove lang files Nedelosk 2018-04-29 12:26:58 +02:00
• c124a34533 Remove outdated lang files and lowercase the names of the other files Nedelosk 2018-04-29 12:24:44 +02:00
• ae038b23f2 Update Lang files to 1.12 Nedelosk 2018-04-29 12:11:34 +02:00
• df29777b49 Update README.md mezz 2018-04-28 15:34:43 -07:00
• a786d71cfd Rename LANG.md to README.md mezz 2018-04-28 15:33:41 -07:00
• 2b757ae91a Move lang files in to the main project (#2104) temp1011 2018-04-28 23:23:56 +01:00